net: extract net/cert out of net/base

This introduces the following dependency of net/base on things outside:

net/base/openssl_client_key_store.cc:#include "net/cert/x509_certificate.h"

BUG=70818

Review URL: https://codereview.chromium.org/13006020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191450 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/native/aw_contents.cc

@@ -38,7 +38,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 struct AwDrawSWFunctionTable;

android_webview/native/aw_contents_client_bridge.cc

@@ -11,7 +11,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "jni/AwContentsClientBridge_jni.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;

android_webview/tools/third_party_files_whitelist.txt

@@ -88,7 +88,7 @@ content/browser/renderer_host/web_input_event_aurax11.cc
 # Copyright Google Inc, no license. Not used on Android.
 google_update/google_update_idl.idl
 # String '(c)' used in certificates organization names
-net/base/test_certificate_data.h
+net/test/test_certificate_data.h
 # Copyright The Chromium Authors and Netscape Communications Corporation; BSD
 # and (MPL, GPL v2 or LGPL v2) licenses. This third-party code is taken from
 # Mozilla, the license for which we already pick up from third_party/npapi/.

chrome/browser/automation/testing_automation_provider.h

@@ -22,7 +22,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_type.h"
 #include "content/public/common/security_style.h"
-#include "net/base/cert_status_flags.h"
+#include "net/cert/cert_status_flags.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
 #if defined(OS_CHROMEOS)

chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc

@@ -14,8 +14,8 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/cert_status_flags.h"
 #include "net/base/net_errors.h"
+#include "net/cert/cert_status_flags.h"
 #include "net/ssl/ssl_info.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/certificate_manager_model.cc

@@ -12,7 +12,7 @@
 #include "chrome/common/net/x509_certificate_model.h"
 #include "net/base/crypto_module.h"
 #include "net/base/net_errors.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 
 #if defined(OS_CHROMEOS)
 #include <cert.h>

chrome/browser/certificate_manager_model.h

@@ -10,7 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
-#include "net/base/nss_cert_database.h"
+#include "net/cert/nss_cert_database.h"
 
 // CertificateManagerModel provides the data to be displayed in the certificate
 // manager dialog, and processes changes from the view.

chrome/browser/certificate_viewer.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/certificate_viewer.h"
 
 #include "content/public/browser/cert_store.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 
 void ShowCertificateViewerByID(content::WebContents* web_contents,
                                gfx::NativeWindow parent,

chrome/browser/chromeos/cros/cert_library.cc

@@ -27,8 +27,8 @@
 #include "crypto/sha2.h"
 #include "crypto/symmetric_key.h"
 #include "grit/generated_resources.h"
-#include "net/base/cert_database.h"
-#include "net/base/nss_cert_database.h"
+#include "net/cert/cert_database.h"
+#include "net/cert/nss_cert_database.h"
 #include "third_party/icu/public/i18n/unicode/coll.h"  // icu::Collator
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_collator.h"

chrome/browser/chromeos/cros/cert_library.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/string16.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 
 namespace crypto {
 class SymmetricKey;

chrome/browser/chromeos/cros/certificate_pattern.cc

@@ -14,11 +14,11 @@
 
 #include "base/logging.h"
 #include "base/values.h"
-#include "net/base/cert_database.h"
 #include "net/base/net_errors.h"
-#include "net/base/nss_cert_database.h"
-#include "net/base/x509_cert_types.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/cert_database.h"
+#include "net/cert/nss_cert_database.h"
+#include "net/cert/x509_cert_types.h"
+#include "net/cert/x509_certificate.h"
 
 // To shorten some of those long lines below.
 using base::DictionaryValue;

chrome/browser/chromeos/cros/network_library_unittest.cc

@@ -27,8 +27,8 @@
 #include "chromeos/network/onc/onc_utils.h"
 #include "crypto/nss_util.h"
 #include "net/base/crypto_module.h"
-#include "net/base/nss_cert_database.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/nss_cert_database.h"
+#include "net/cert/x509_certificate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/chromeos/web_socket_proxy.cc

@@ -50,10 +50,10 @@
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_parse.h"
 #include "net/base/address_list.h"
-#include "net/base/cert_verifier.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
+#include "net/cert/cert_verifier.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/ssl_client_socket.h"

chrome/browser/io_thread.cc

@@ -40,11 +40,11 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/cert_verifier.h"
 #include "net/base/host_cache.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/net_util.h"
 #include "net/base/sdch_manager.h"
+#include "net/cert/cert_verifier.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/mapped_host_resolver.h"

chrome/browser/net/chrome_fraudulent_certificate_reporter.cc

@@ -14,7 +14,7 @@
 #include "net/base/load_flags.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_info.h"
 #include "net/url_request/url_request_context.h"
 

chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc

@@ -14,11 +14,11 @@
 #include "base/threading/thread.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "content/public/test/test_browser_thread.h"
-#include "net/base/cert_test_util.h"
 #include "net/base/test_data_directory.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "net/http/transport_security_state.h"
 #include "net/ssl/ssl_info.h"
+#include "net/test/cert_test_util.h"
 #include "net/url_request/fraudulent_certificate_reporter.h"
 #include "net/url_request/url_request.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/net/connection_tester.cc

@@ -15,10 +15,10 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/cert_verifier.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
+#include "net/cert/cert_verifier.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/dns/host_resolver.h"
 #include "net/ftp/ftp_network_layer.h"

chrome/browser/net/connection_tester_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "base/prefs/testing_pref_service.h"
 #include "content/public/test/test_browser_thread.h"
-#include "net/base/mock_cert_verifier.h"
+#include "net/cert/mock_cert_verifier.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/ftp/ftp_network_layer.h"

chrome/browser/net/crl_set_fetcher.cc

@@ -15,7 +15,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/crl_set.h"
+#include "net/cert/crl_set.h"
 #include "net/ssl/ssl_config_service.h"
 
 using content::BrowserThread;

chrome/browser/net/sqlite_server_bound_cert_store.cc

@@ -20,7 +20,7 @@
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/browser/net/clear_on_exit_policy.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_client_cert_type.h"
 #include "sql/meta_table.h"
 #include "sql/statement.h"

chrome/browser/net/sqlite_server_bound_cert_store_unittest.cc

@@ -15,8 +15,8 @@
 #include "chrome/browser/net/sqlite_server_bound_cert_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/test/test_browser_thread.h"
-#include "net/base/cert_test_util.h"
 #include "net/base/test_data_directory.h"
+#include "net/test/cert_test_util.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/quota/mock_special_storage_policy.h"

chrome/browser/net/transport_security_persister.cc

@@ -16,7 +16,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/sha2.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "net/http/transport_security_state.h"
 
 using content::BrowserThread;

chrome/browser/password_manager/password_manager_delegate_impl.cc

@@ -24,7 +24,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "net/base/cert_status_flags.h"
+#include "net/cert/cert_status_flags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 

chrome/browser/safe_browsing/download_protection_service.cc

@@ -32,8 +32,8 @@
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
-#include "net/base/x509_cert_types.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_cert_types.h"
+#include "net/cert/x509_certificate.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"

chrome/browser/safe_browsing/download_protection_service_unittest.cc

@@ -27,7 +27,7 @@
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"

chrome/browser/safe_browsing/signature_util_win_unittest.cc

@@ -12,8 +12,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
-#include "net/base/x509_cert_types.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_cert_types.h"
+#include "net/cert/x509_certificate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace safe_browsing {

chrome/browser/ssl/ssl_add_cert_handler.cc

@@ -10,9 +10,9 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
-#include "net/base/cert_database.h"
 #include "net/base/net_errors.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/cert_database.h"
+#include "net/cert/x509_certificate.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;

chrome/browser/ssl/ssl_add_cert_handler_mac.mm

@@ -9,12 +9,12 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_nsobject.h"
-#include "chrome/common/logging_chrome.h"
-#include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
+#include "chrome/common/logging_chrome.h"
 #include "grit/generated_resources.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 @interface SSLAddCertHandlerCocoa : NSObject

chrome/browser/ssl/ssl_add_certificate.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/ssl/ssl_add_certificate.h"
 
 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 
 namespace chrome {
 

chrome/browser/ssl/ssl_browser_tests.cc

@@ -38,14 +38,14 @@
 #include "content/public/test/download_test_observer.h"
 #include "content/public/test/test_renderer_host.h"
 #include "crypto/nss_util.h"
-#include "net/base/cert_status_flags.h"
 #include "net/base/crypto_module.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
+#include "net/cert/cert_status_flags.h"
 #include "net/test/test_server.h"
 
 #if defined(USE_NSS)
-#include "net/base/nss_cert_database.h"
+#include "net/cert/nss_cert_database.h"
 #endif  // defined(USE_NSS)
 
 using content::InterstitialPage;

chrome/browser/ssl/ssl_client_auth_observer.cc

@@ -11,7 +11,7 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_cert_request_info.h"
 
 using content::BrowserThread;

chrome/browser/ssl/ssl_client_certificate_selector_test.cc

@@ -12,11 +12,11 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
-#include "net/base/cert_test_util.h"
 #include "net/base/test_data_directory.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/ssl/ssl_cert_request_info.h"
+#include "net/test/cert_test_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"

chrome/browser/ssl/ssl_error_info.cc

@@ -11,9 +11,9 @@
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "net/base/cert_status_flags.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
+#include "net/cert/cert_status_flags.h"
 #include "net/ssl/ssl_info.h"
 #include "ui/base/l10n/l10n_util.h"
 

chrome/browser/ssl/ssl_error_info.h

@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "base/string16.h"
-#include "net/base/cert_status_flags.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/cert_status_flags.h"
+#include "net/cert/x509_certificate.h"
 
 class GURL;
 

chrome/browser/ssl/ssl_tab_helper.cc

@@ -32,7 +32,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_errors.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 

chrome/browser/ui/android/certificate_viewer_android.cc

@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "grit/generated_resources.h"
 #include "jni/CertificateViewer_jni.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::ConvertUTF8ToJavaString;

chrome/browser/ui/android/ssl_client_certificate_request.cc

@@ -17,7 +17,7 @@
 #include "net/android/keystore_openssl.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/openssl_client_key_store.h"
-#include "net/base/x509_certificate.h"
+#include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_client_cert_type.h"