diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 21:48:11 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 21:48:11 +0000 |
| commit | 6e7845aed4759ab35d722ce0551b5a90d21e7640 (patch) | |
| tree | f29a3f007f7ded842d2096446ff7ecaf186cb362 | |
| parent | a6b4f91d970aa2b71b0f3552dbc11e94f7650fd5 (diff) | |
| download | chromium_src-6e7845aed4759ab35d722ce0551b5a90d21e7640.zip chromium_src-6e7845aed4759ab35d722ce0551b5a90d21e7640.tar.gz chromium_src-6e7845aed4759ab35d722ce0551b5a90d21e7640.tar.bz2 | |
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
248 files changed, 653 insertions, 676 deletions
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index f4cc2e2..0284f56 100644 --- a/android_webview/native/aw_contents.cc +++ b/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; diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc index 2149ae0..0c13ebe 100644 --- a/android_webview/native/aw_contents_client_bridge.cc +++ b/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; diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt index 7011a92..5361c3d 100644 --- a/android_webview/tools/third_party_files_whitelist.txt +++ b/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/. diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h index 61afff5..3bcbefd 100644 --- a/chrome/browser/automation/testing_automation_provider.h +++ b/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) diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc index d4ef7fa..2856826 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc +++ b/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" diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc index 4176865..f519a0d 100644 --- a/chrome/browser/certificate_manager_model.cc +++ b/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> diff --git a/chrome/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h index 6e21f67..f7094b6 100644 --- a/chrome/browser/certificate_manager_model.h +++ b/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. diff --git a/chrome/browser/certificate_viewer.cc b/chrome/browser/certificate_viewer.cc index c8e9fd9..38d502d 100644 --- a/chrome/browser/certificate_viewer.cc +++ b/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, diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index 84ba281..5c7adda 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/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" diff --git a/chrome/browser/chromeos/cros/cert_library.h b/chrome/browser/chromeos/cros/cert_library.h index 22c0c5f..faaa878 100644 --- a/chrome/browser/chromeos/cros/cert_library.h +++ b/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; diff --git a/chrome/browser/chromeos/cros/certificate_pattern.cc b/chrome/browser/chromeos/cros/certificate_pattern.cc index df1e28a..78249bc 100644 --- a/chrome/browser/chromeos/cros/certificate_pattern.cc +++ b/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; diff --git a/chrome/browser/chromeos/cros/network_library_unittest.cc b/chrome/browser/chromeos/cros/network_library_unittest.cc index aab1040..2b12973 100644 --- a/chrome/browser/chromeos/cros/network_library_unittest.cc +++ b/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" diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 8803c9e..23b3fb8 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/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" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index e233a63..76d5df7 100644 --- a/chrome/browser/io_thread.cc +++ b/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" diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc index 995e91a..c5aed31 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc +++ b/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" diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc index 760a4bf..4326fb9 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc +++ b/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" diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 384b26a..3e93aae 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/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" diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index 5b40ef4..3f537b0 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/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" diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc index f03cc27..1b10f63 100644 --- a/chrome/browser/net/crl_set_fetcher.cc +++ b/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; diff --git a/chrome/browser/net/sqlite_server_bound_cert_store.cc b/chrome/browser/net/sqlite_server_bound_cert_store.cc index 1dfcbf1..983f896 100644 --- a/chrome/browser/net/sqlite_server_bound_cert_store.cc +++ b/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" diff --git a/chrome/browser/net/sqlite_server_bound_cert_store_unittest.cc b/chrome/browser/net/sqlite_server_bound_cert_store_unittest.cc index e22f9e9..5b77dc5 100644 --- a/chrome/browser/net/sqlite_server_bound_cert_store_unittest.cc +++ b/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" diff --git a/chrome/browser/net/transport_security_persister.cc b/chrome/browser/net/transport_security_persister.cc index 7eef2cf..140eb39 100644 --- a/chrome/browser/net/transport_security_persister.cc +++ b/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; diff --git a/chrome/browser/password_manager/password_manager_delegate_impl.cc b/chrome/browser/password_manager/password_manager_delegate_impl.cc index 8264747..0b5d56b 100644 --- a/chrome/browser/password_manager/password_manager_delegate_impl.cc +++ b/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" diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index 4183850..a46d678 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/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" diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc index 2eb3f03..a79e70b 100644 --- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc +++ b/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" diff --git a/chrome/browser/safe_browsing/signature_util_win_unittest.cc b/chrome/browser/safe_browsing/signature_util_win_unittest.cc index b6fb491..294a8e9 100644 --- a/chrome/browser/safe_browsing/signature_util_win_unittest.cc +++ b/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 { diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc index 60fe835..019d604 100644 --- a/chrome/browser/ssl/ssl_add_cert_handler.cc +++ b/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; diff --git a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm b/chrome/browser/ssl/ssl_add_cert_handler_mac.mm index f3f61e3..d12e477 100644 --- a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm +++ b/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 diff --git a/chrome/browser/ssl/ssl_add_certificate.cc b/chrome/browser/ssl/ssl_add_certificate.cc index a21c843..fd1d510 100644 --- a/chrome/browser/ssl/ssl_add_certificate.cc +++ b/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 { diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 9ead4e6..42cfbf6 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/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; diff --git a/chrome/browser/ssl/ssl_client_auth_observer.cc b/chrome/browser/ssl/ssl_client_auth_observer.cc index cbdaace..97c87e4 100644 --- a/chrome/browser/ssl/ssl_client_auth_observer.cc +++ b/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; diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc index 751b352..57e994b 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc +++ b/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" diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index c119477..87848a5 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/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" diff --git a/chrome/browser/ssl/ssl_error_info.h b/chrome/browser/ssl/ssl_error_info.h index ae9568e..f03463c 100644 --- a/chrome/browser/ssl/ssl_error_info.h +++ b/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; diff --git a/chrome/browser/ssl/ssl_tab_helper.cc b/chrome/browser/ssl/ssl_tab_helper.cc index 476f0a1..8caa2df 100644 --- a/chrome/browser/ssl/ssl_tab_helper.cc +++ b/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" diff --git a/chrome/browser/ui/android/certificate_viewer_android.cc b/chrome/browser/ui/android/certificate_viewer_android.cc index 0768a38..41b3831 100644 --- a/chrome/browser/ui/android/certificate_viewer_android.cc +++ b/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; diff --git a/chrome/browser/ui/android/ssl_client_certificate_request.cc b/chrome/browser/ui/android/ssl_client_certificate_request.cc index 965cfc9..5b44822 100644 --- a/chrome/browser/ui/android/ssl_client_certificate_request.cc +++ b/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" diff --git a/chrome/browser/ui/android/website_settings_popup_android.cc b/chrome/browser/ui/android/website_settings_popup_android.cc index 3744758..1393c39 100644 --- a/chrome/browser/ui/android/website_settings_popup_android.cc +++ b/chrome/browser/ui/android/website_settings_popup_android.cc @@ -18,7 +18,7 @@ #include "content/public/common/ssl_status.h" #include "grit/generated_resources.h" #include "jni/WebsiteSettingsPopup_jni.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/android/java_bitmap.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc index f6fef62..e83c9a8 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc @@ -58,7 +58,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/webkit_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" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/certificate_dialogs.h b/chrome/browser/ui/certificate_dialogs.h index 9726621..9787ffc 100644 --- a/chrome/browser/ui/certificate_dialogs.h +++ b/chrome/browser/ui/certificate_dialogs.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_CERTIFICATE_DIALOGS_H_ #define CHROME_BROWSER_UI_CERTIFICATE_DIALOGS_H_ -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "ui/shell_dialogs/select_file_dialog.h" namespace content { diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm index c69cc83..9c27854 100644 --- a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm +++ b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm @@ -11,8 +11,8 @@ #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" -#include "net/base/x509_certificate.h" -#include "net/base/x509_util_mac.h" +#include "net/cert/x509_certificate.h" +#include "net/cert/x509_util_mac.h" void ShowCertificateViewer(content::WebContents* web_contents, gfx::NativeWindow parent, diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm index 8c3abb9..0330879 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm @@ -17,8 +17,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" -#include "net/base/x509_certificate.h" -#include "net/base/x509_util_mac.h" +#include "net/cert/x509_certificate.h" +#include "net/cert/x509_util_mac.h" #include "net/ssl/ssl_cert_request_info.h" #include "ui/base/cocoa/window_size_constants.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.cc index cff7e25..e349f86 100644 --- a/chrome/browser/ui/crypto_module_password_dialog_nss.cc +++ b/chrome/browser/ui/crypto_module_password_dialog_nss.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "content/public/browser/browser_thread.h" #include "net/base/crypto_module.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #if defined(OS_CHROMEOS) #include "crypto/nss_util.h" diff --git a/chrome/browser/ui/gtk/certificate_viewer_gtk.cc b/chrome/browser/ui/gtk/certificate_viewer_gtk.cc index 6d01b64..8f56047 100644 --- a/chrome/browser/ui/gtk/certificate_viewer_gtk.cc +++ b/chrome/browser/ui/gtk/certificate_viewer_gtk.cc @@ -18,7 +18,7 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/net/x509_certificate_model.h" #include "grit/generated_resources.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "ui/base/gtk/gtk_hig_constants.h" #include "ui/base/gtk/menu_label_accelerator_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc index c7061e4..ebf2e78 100644 --- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc @@ -22,7 +22,7 @@ #include "chrome/common/net/x509_certificate_model.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "net/ssl/ssl_cert_request_info.h" #include "ui/base/gtk/gtk_compat.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc index a6305b8..4e63e23 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc @@ -30,9 +30,9 @@ #include "extensions/common/constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "net/base/cert_status_flags.h" #include "net/base/net_util.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/x509_certificate.h" #include "ui/base/l10n/l10n_util.h" using content::NavigationController; diff --git a/chrome/browser/ui/views/certificate_viewer_win.cc b/chrome/browser/ui/views/certificate_viewer_win.cc index f1097df..21948ae 100644 --- a/chrome/browser/ui/views/certificate_viewer_win.cc +++ b/chrome/browser/ui/views/certificate_viewer_win.cc @@ -9,7 +9,7 @@ #pragma comment(lib, "cryptui.lib") #include "base/logging.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #if defined(USE_AURA) #include "chrome/browser/ui/host_desktop.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index 6389290..9e7b3879 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -15,7 +15,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "net/ssl/ssl_cert_request_info.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index a2ef9dd..7dd013e 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -15,11 +15,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" diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc index aeef90d..daf7257 100644 --- a/chrome/browser/ui/website_settings/website_settings.cc +++ b/chrome/browser/ui/website_settings/website_settings.cc @@ -37,9 +37,9 @@ #include "content/public/common/url_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "net/base/cert_status_flags.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/x509_certificate.h" #include "net/ssl/ssl_cipher_suite_names.h" #include "net/ssl/ssl_connection_status_flags.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc index 6ee1a03..4fe881a 100644 --- a/chrome/browser/ui/website_settings/website_settings_unittest.cc +++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc @@ -22,10 +22,10 @@ #include "content/public/browser/cert_store.h" #include "content/public/common/ssl_status.h" #include "content/public/test/test_browser_thread.h" -#include "net/base/cert_status_flags.h" -#include "net/base/test_certificate_data.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/x509_certificate.h" #include "net/ssl/ssl_connection_status_flags.h" +#include "net/test/test_certificate_data.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.h b/chrome/browser/ui/webui/certificate_viewer_webui.h index fe829ec..726cdd7 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.h +++ b/chrome/browser/ui/webui/certificate_viewer_webui.h @@ -12,7 +12,7 @@ #include "base/observer_list.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "ui/gfx/native_widget_types.h" #include "ui/web_dialogs/web_dialog_delegate.h" diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index 947947d..c1e18da 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc @@ -26,7 +26,7 @@ #include "grit/generated_resources.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" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h index 47de402..ba479bf 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.h +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.h @@ -13,7 +13,7 @@ #include "chrome/browser/certificate_manager_model.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "chrome/common/cancelable_task_tracker.h" -#include "net/base/nss_cert_database.h" +#include "net/cert/nss_cert_database.h" #include "ui/gfx/native_widget_types.h" #include "ui/shell_dialogs/select_file_dialog.h" diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 922e415..e734f20 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -18,7 +18,7 @@ '../content/public/common/security_style.h', # Must come before cert_status_flags.h '../net/base/net_export.h', - '../net/base/cert_status_flags.h', + '../net/cert/cert_status_flags.h', ], 'conditions': [ ['asan==1', { diff --git a/chrome/common/automation_messages.h b/chrome/common/automation_messages.h index 2f908f6..3a9a92b 100644 --- a/chrome/common/automation_messages.h +++ b/chrome/common/automation_messages.h @@ -18,7 +18,7 @@ #include "googleurl/src/gurl.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h" -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" #include "net/base/host_port_pair.h" #include "net/base/upload_data.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/common/net/x509_certificate_model.h b/chrome/common/net/x509_certificate_model.h index 6c4e31c..16cae48 100644 --- a/chrome/common/net/x509_certificate_model.h +++ b/chrome/common/net/x509_certificate_model.h @@ -5,8 +5,8 @@ #ifndef CHROME_COMMON_NET_X509_CERTIFICATE_MODEL_H_ #define CHROME_COMMON_NET_X509_CERTIFICATE_MODEL_H_ -#include "net/base/cert_type.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_type.h" +#include "net/cert/x509_certificate.h" // This namespace defines a set of functions to be used in UI-related bits of // X509 certificates. It decouples the UI from the underlying crypto library diff --git a/chrome/common/net/x509_certificate_model_nss.cc b/chrome/common/net/x509_certificate_model_nss.cc index fbbaa3f..5f40ce3 100644 --- a/chrome/common/net/x509_certificate_model_nss.cc +++ b/chrome/common/net/x509_certificate_model_nss.cc @@ -20,7 +20,7 @@ #include "chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.h" #include "crypto/nss_util.h" #include "crypto/scoped_nss_types.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace psm = mozilla_security_manager; diff --git a/chrome/common/net/x509_certificate_model_openssl.cc b/chrome/common/net/x509_certificate_model_openssl.cc index 482ea72..03d53eb 100644 --- a/chrome/common/net/x509_certificate_model_openssl.cc +++ b/chrome/common/net/x509_certificate_model_openssl.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" -#include "net/base/x509_util_openssl.h" +#include "net/cert/x509_util_openssl.h" namespace x509_util = net::x509_util; diff --git a/chrome/common/net/x509_certificate_model_unittest.cc b/chrome/common/net/x509_certificate_model_unittest.cc index 4a08f4c..8a336b4 100644 --- a/chrome/common/net/x509_certificate_model_unittest.cc +++ b/chrome/common/net/x509_certificate_model_unittest.cc @@ -7,9 +7,9 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "net/base/cert_test_util.h" -#include "net/base/nss_cert_database.h" #include "net/base/test_data_directory.h" +#include "net/cert/nss_cert_database.h" +#include "net/test/cert_test_util.h" #include "testing/gtest/include/gtest/gtest.h" TEST(X509CertificateModelTest, GetTypeCA) { diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc index 5fdee43..640e310 100644 --- a/chrome/service/net/service_url_request_context.cc +++ b/chrome/service/net/service_url_request_context.cc @@ -14,7 +14,7 @@ #include "base/sys_info.h" #include "chrome/common/chrome_version_info.h" #include "chrome/service/service_process.h" -#include "net/base/cert_verifier.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" diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index 22942dc..5e66046 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -22,7 +22,7 @@ #include "content/public/browser/save_page_type.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 "ui/base/keycodes/keyboard_codes.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/test/data/webui/certificate_viewer_ui_test-inl.h b/chrome/test/data/webui/certificate_viewer_ui_test-inl.h index 74da71e..7a8fba5 100644 --- a/chrome/test/data/webui/certificate_viewer_ui_test-inl.h +++ b/chrome/test/data/webui/certificate_viewer_ui_test-inl.h @@ -13,8 +13,8 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -#include "net/base/test_certificate_data.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" +#include "net/test/test_certificate_data.h" #include "ui/web_dialogs/test/test_web_dialog_observer.h" // Test framework for chrome/test/data/webui/certificate_viewer_dialog_test.js. diff --git a/chrome/test/pyautolib/pyautolib.i b/chrome/test/pyautolib/pyautolib.i index b539b74..6f17123 100644 --- a/chrome/test/pyautolib/pyautolib.i +++ b/chrome/test/pyautolib/pyautolib.i @@ -36,7 +36,7 @@ // Must come before cert_status_flags.h %include "net/base/net_export.h" %ignore net::MapNetErrorToCertStatus(int); -%include "net/base/cert_status_flags.h" +%include "net/cert/cert_status_flags.h" #if defined(OS_CHROMEOS) %include "chrome/browser/chromeos/cros/network_constants.h" diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h index 71ee1ac..96fae9f 100644 --- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h +++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h @@ -46,7 +46,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" namespace mozilla_security_manager { diff --git a/chromeos/network/onc/onc_certificate_importer.cc b/chromeos/network/onc/onc_certificate_importer.cc index b236927..3407971 100644 --- a/chromeos/network/onc/onc_certificate_importer.cc +++ b/chromeos/network/onc/onc_certificate_importer.cc @@ -15,9 +15,9 @@ #include "chromeos/network/onc/onc_constants.h" #include "net/base/crypto_module.h" #include "net/base/net_errors.h" -#include "net/base/nss_cert_database.h" -#include "net/base/pem_tokenizer.h" -#include "net/base/x509_certificate.h" +#include "net/cert/nss_cert_database.h" +#include "net/cert/pem_tokenizer.h" +#include "net/cert/x509_certificate.h" #define ONC_LOG_WARNING(message) NET_LOG_WARNING("ONC", message) #define ONC_LOG_ERROR(message) NET_LOG_ERROR("ONC", message) diff --git a/chromeos/network/onc/onc_certificate_importer_unittest.cc b/chromeos/network/onc/onc_certificate_importer_unittest.cc index 90d081b..84f29f7 100644 --- a/chromeos/network/onc/onc_certificate_importer_unittest.cc +++ b/chromeos/network/onc/onc_certificate_importer_unittest.cc @@ -16,10 +16,10 @@ #include "chromeos/network/onc/onc_constants.h" #include "chromeos/network/onc/onc_test_utils.h" #include "crypto/nss_util.h" -#include "net/base/cert_type.h" #include "net/base/crypto_module.h" -#include "net/base/nss_cert_database.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_type.h" +#include "net/cert/nss_cert_database.h" +#include "net/cert/x509_certificate.h" #include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/content/browser/cert_store_impl.h b/content/browser/cert_store_impl.h index 5c13fa3..8a326e9 100644 --- a/content/browser/cert_store_impl.h +++ b/content/browser/cert_store_impl.h @@ -12,7 +12,7 @@ #include "content/public/browser/cert_store.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace content { diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index 3849313..3b44a0e 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -67,7 +67,7 @@ #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_start.h" #include "net/base/auth.h" -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" #include "net/base/load_flags.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc index 781b62c..5e68b6d 100644 --- a/content/browser/loader/resource_loader_unittest.cc +++ b/content/browser/loader/resource_loader_unittest.cc @@ -10,7 +10,7 @@ #include "content/public/browser/resource_request_info.h" #include "content/public/test/mock_resource_context.h" #include "content/test/test_content_browser_client.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "net/ssl/client_cert_store.h" #include "net/ssl/ssl_cert_request_info.h" #include "net/url_request/url_request.h" diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc index 069678c..f73e08d 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc @@ -30,9 +30,9 @@ #include "content/public/common/content_client.h" #include "net/base/address_family.h" #include "net/base/address_list.h" -#include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" #include "net/base/sys_addrinfo.h" +#include "net/cert/cert_verifier.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_net_address_private.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc index e6732e5..c77563a 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc +++ b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc @@ -13,12 +13,12 @@ #include "base/string_util.h" #include "content/browser/renderer_host/pepper/pepper_message_filter.h" #include "content/public/browser/browser_thread.h" -#include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/x509_certificate.h" #include "net/dns/host_resolver.h" #include "net/dns/single_request_host_resolver.h" #include "net/socket/client_socket_factory.h" diff --git a/content/browser/ssl/ssl_cert_error_handler.cc b/content/browser/ssl/ssl_cert_error_handler.cc index 268ccf7..b3bdb41 100644 --- a/content/browser/ssl/ssl_cert_error_handler.cc +++ b/content/browser/ssl/ssl_cert_error_handler.cc @@ -6,8 +6,8 @@ #include "content/browser/ssl/ssl_manager.h" #include "content/browser/ssl/ssl_policy.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" namespace content { diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc index 97db658..1180269 100644 --- a/content/browser/ssl/ssl_client_auth_handler.cc +++ b/content/browser/ssl/ssl_client_auth_handler.cc @@ -9,7 +9,7 @@ #include "content/browser/loader/resource_request_info_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "net/http/http_transaction_factory.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" diff --git a/content/browser/ssl/ssl_host_state.h b/content/browser/ssl/ssl_host_state.h index da3fe9c..d3b69c2 100644 --- a/content/browser/ssl/ssl_host_state.h +++ b/content/browser/ssl/ssl_host_state.h @@ -5,17 +5,17 @@ #ifndef CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_ #define CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_ -#include <string> #include <map> #include <set> +#include <string> -#include "base/compiler_specific.h" #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/supports_user_data.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h" #include "googleurl/src/gurl.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace content { class BrowserContext; diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h index 8cd1668..0ccedb2 100644 --- a/content/browser/ssl/ssl_manager.h +++ b/content/browser/ssl/ssl_manager.h @@ -17,7 +17,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "googleurl/src/gurl.h" -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" #include "net/base/net_errors.h" namespace net { diff --git a/content/browser/ssl/ssl_policy_backend.h b/content/browser/ssl/ssl_policy_backend.h index 3d8f390..bef0469 100644 --- a/content/browser/ssl/ssl_policy_backend.h +++ b/content/browser/ssl/ssl_policy_backend.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace content { class NavigationControllerImpl; diff --git a/content/browser/ssl/ssl_request_info.h b/content/browser/ssl/ssl_request_info.h index 5e9428c..d5971ed 100644 --- a/content/browser/ssl/ssl_request_info.h +++ b/content/browser/ssl/ssl_request_info.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "googleurl/src/gurl.h" -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" #include "webkit/glue/resource_type.h" namespace content { diff --git a/content/common/ssl_status_serialization.h b/content/common/ssl_status_serialization.h index d913453..e3db1a2 100644 --- a/content/common/ssl_status_serialization.h +++ b/content/common/ssl_status_serialization.h @@ -7,7 +7,7 @@ #include <string> -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" namespace content { diff --git a/content/public/browser/load_from_memory_cache_details.h b/content/public/browser/load_from_memory_cache_details.h index 49de85b..1ebf491 100644 --- a/content/public/browser/load_from_memory_cache_details.h +++ b/content/public/browser/load_from_memory_cache_details.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" #include "googleurl/src/gurl.h" -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" #include "webkit/glue/resource_type.h" namespace content { diff --git a/content/public/browser/resource_request_details.h b/content/public/browser/resource_request_details.h index 9504b30..4e94418 100644 --- a/content/public/browser/resource_request_details.h +++ b/content/public/browser/resource_request_details.h @@ -8,7 +8,7 @@ #include <string> #include "googleurl/src/gurl.h" -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" #include "net/base/host_port_pair.h" #include "net/url_request/url_request_status.h" #include "webkit/glue/resource_type.h" diff --git a/content/public/common/ssl_status.h b/content/public/common/ssl_status.h index 5d750a0..049a5af 100644 --- a/content/public/common/ssl_status.h +++ b/content/public/common/ssl_status.h @@ -7,7 +7,7 @@ #include "content/common/content_export.h" #include "content/public/common/security_style.h" -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" namespace content { diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc index e861369..8235052 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/shell_url_request_context_getter.cc @@ -15,7 +15,7 @@ #include "content/public/common/url_constants.h" #include "content/shell/shell_network_delegate.h" #include "content/shell/shell_switches.h" -#include "net/base/cert_verifier.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" diff --git a/jingle/glue/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc index 058c5ea..d609dcb 100644 --- a/jingle/glue/chrome_async_socket_unittest.cc +++ b/jingle/glue/chrome_async_socket_unittest.cc @@ -13,9 +13,9 @@ #include "base/message_loop.h" #include "jingle/glue/resolving_client_socket_factory.h" #include "net/base/address_list.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" +#include "net/cert/mock_cert_verifier.h" #include "net/socket/socket_test_util.h" #include "net/socket/ssl_client_socket.h" #include "net/ssl/ssl_config_service.h" diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc index a230d29..686e949 100644 --- a/jingle/notifier/base/xmpp_connection_unittest.cc +++ b/jingle/notifier/base/xmpp_connection_unittest.cc @@ -14,7 +14,7 @@ #include "jingle/glue/mock_task.h" #include "jingle/glue/task_pump.h" #include "jingle/notifier/base/weak_xmpp_client.h" -#include "net/base/cert_verifier.h" +#include "net/cert/cert_verifier.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_test_util.h" #include "talk/xmpp/prexmppauth.h" diff --git a/jingle/notifier/communicator/login_settings.cc b/jingle/notifier/communicator/login_settings.cc index 762d96c..3dacbea 100644 --- a/jingle/notifier/communicator/login_settings.cc +++ b/jingle/notifier/communicator/login_settings.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "jingle/notifier/base/server_information.h" -#include "net/base/cert_verifier.h" +#include "net/cert/cert_verifier.h" #include "talk/base/common.h" #include "talk/base/socketaddress.h" diff --git a/net/base/openssl_client_key_store.cc b/net/base/openssl_client_key_store.cc index 5cae6c5..426a4c2 100644 --- a/net/base/openssl_client_key_store.cc +++ b/net/base/openssl_client_key_store.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/openssl_client_key_store_unittest.cc b/net/base/openssl_client_key_store_unittest.cc index 0b6506a..89db51e 100644 --- a/net/base/openssl_client_key_store_unittest.cc +++ b/net/base/openssl_client_key_store_unittest.cc @@ -5,8 +5,8 @@ #include "net/base/openssl_client_key_store.h" #include "base/memory/ref_counted.h" -#include "net/base/cert_test_util.h" #include "net/base/test_data_directory.h" +#include "net/test/cert_test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/asn1_util.cc b/net/cert/asn1_util.cc index 2f606b6..6dcff52 100644 --- a/net/base/asn1_util.cc +++ b/net/cert/asn1_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/asn1_util.h" +#include "net/cert/asn1_util.h" namespace net { diff --git a/net/base/asn1_util.h b/net/cert/asn1_util.h index 7c584c4..9a10bee 100644 --- a/net/base/asn1_util.h +++ b/net/cert/asn1_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_ASN1_UTIL_H_ -#define NET_BASE_ASN1_UTIL_H_ +#ifndef NET_CERT_ASN1_UTIL_H_ +#define NET_CERT_ASN1_UTIL_H_ #include <vector> @@ -90,4 +90,4 @@ NET_EXPORT_PRIVATE bool ExtractCRLURLsFromDERCert( } // namespace net -#endif // NET_BASE_ASN1_UTIL_H_ +#endif // NET_CERT_ASN1_UTIL_H_ diff --git a/net/base/cert_database.cc b/net/cert/cert_database.cc index ec2f0b8..db54172 100644 --- a/net/base/cert_database.cc +++ b/net/cert/cert_database.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" #include "base/memory/singleton.h" #include "base/observer_list_threadsafe.h" diff --git a/net/base/cert_database.h b/net/cert/cert_database.h index d71a254..c4ead81 100644 --- a/net/base/cert_database.h +++ b/net/cert/cert_database.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_DATABASE_H_ -#define NET_BASE_CERT_DATABASE_H_ +#ifndef NET_CERT_CERT_DATABASE_H_ +#define NET_CERT_CERT_DATABASE_H_ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "net/base/net_export.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" template <typename T> struct DefaultSingletonTraits; template <class ObserverType> class ObserverListThreadSafe; @@ -102,4 +102,4 @@ class NET_EXPORT CertDatabase { } // namespace net -#endif // NET_BASE_CERT_DATABASE_H_ +#endif // NET_CERT_CERT_DATABASE_H_ diff --git a/net/base/cert_database_android.cc b/net/cert/cert_database_android.cc index c441089..9755805 100644 --- a/net/base/cert_database_android.cc +++ b/net/cert/cert_database_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" #include "base/logging.h" #include "base/observer_list_threadsafe.h" diff --git a/net/base/cert_database_ios.cc b/net/cert/cert_database_ios.cc index b7e6ad3..f96f22a 100644 --- a/net/base/cert_database_ios.cc +++ b/net/cert/cert_database_ios.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" #include "base/logging.h" #include "base/observer_list_threadsafe.h" diff --git a/net/base/cert_database_mac.cc b/net/cert/cert_database_mac.cc index 2d3ef14..c8fcf47 100644 --- a/net/base/cert_database_mac.cc +++ b/net/cert/cert_database_mac.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" #include <Security/Security.h> @@ -15,7 +15,7 @@ #include "base/synchronization/lock.h" #include "crypto/mac_security_services_lock.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/cert_database_nss.cc b/net/cert/cert_database_nss.cc index e0f4ca6..3ac1407 100644 --- a/net/base/cert_database_nss.cc +++ b/net/cert/cert_database_nss.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" #include <cert.h> #include <pk11pub.h> @@ -12,8 +12,8 @@ #include "base/observer_list_threadsafe.h" #include "crypto/nss_util.h" #include "net/base/net_errors.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" namespace net { diff --git a/net/base/cert_database_openssl.cc b/net/cert/cert_database_openssl.cc index 8d73b3a..23b64cc 100644 --- a/net/base/cert_database_openssl.cc +++ b/net/cert/cert_database_openssl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" #include <openssl/x509.h> @@ -12,7 +12,7 @@ #include "net/base/crypto_module.h" #include "net/base/net_errors.h" #include "net/base/openssl_private_key_store.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/cert_database_win.cc b/net/cert/cert_database_win.cc index f0f0dbd..9bf378c 100644 --- a/net/base/cert_database_win.cc +++ b/net/cert/cert_database_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" #include <windows.h> #include <wincrypt.h> @@ -10,7 +10,7 @@ #include "base/observer_list_threadsafe.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/cert_status_flags.cc b/net/cert/cert_status_flags.cc index 07b9751..8cb736c 100644 --- a/net/base/cert_status_flags.cc +++ b/net/cert/cert_status_flags.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" #include "base/logging.h" #include "net/base/net_errors.h" diff --git a/net/base/cert_status_flags.h b/net/cert/cert_status_flags.h index ff23375..8431032 100644 --- a/net/base/cert_status_flags.h +++ b/net/cert/cert_status_flags.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_STATUS_FLAGS_H_ -#define NET_BASE_CERT_STATUS_FLAGS_H_ +#ifndef NET_CERT_CERT_STATUS_FLAGS_H_ +#define NET_CERT_CERT_STATUS_FLAGS_H_ #include "base/basictypes.h" #include "net/base/net_export.h" @@ -58,4 +58,4 @@ NET_EXPORT int MapCertStatusToNetError(CertStatus cert_status); } // namespace net -#endif // NET_BASE_CERT_STATUS_FLAGS_H_ +#endif // NET_CERT_CERT_STATUS_FLAGS_H_ diff --git a/net/base/cert_trust_anchor_provider.h b/net/cert/cert_trust_anchor_provider.h index 6a95068..1712b2d 100644 --- a/net/base/cert_trust_anchor_provider.h +++ b/net/cert/cert_trust_anchor_provider.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_TRUST_ANCHOR_PROVIDER_H_ -#define NET_BASE_CERT_TRUST_ANCHOR_PROVIDER_H_ +#ifndef NET_CERT_CERT_TRUST_ANCHOR_PROVIDER_H_ +#define NET_CERT_CERT_TRUST_ANCHOR_PROVIDER_H_ #include <vector> @@ -30,4 +30,4 @@ class NET_EXPORT CertTrustAnchorProvider { } // namespace net -#endif // NET_BASE_CERT_TRUST_ANCHOR_PROVIDER_H_ +#endif // NET_CERT_CERT_TRUST_ANCHOR_PROVIDER_H_ diff --git a/net/base/cert_type.h b/net/cert/cert_type.h index d9cb8a5..cb21227 100644 --- a/net/base/cert_type.h +++ b/net/cert/cert_type.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_TYPE_H_ -#define NET_BASE_CERT_TYPE_H_ +#ifndef NET_CERT_CERT_TYPE_H_ +#define NET_CERT_CERT_TYPE_H_ namespace net { @@ -25,4 +25,4 @@ enum CertType { } // namespace net -#endif // NET_BASE_CERT_TYPE_H_ +#endif // NET_CERT_CERT_TYPE_H_ diff --git a/net/base/cert_verifier.cc b/net/cert/cert_verifier.cc index fd28f1d..e4acec4 100644 --- a/net/base/cert_verifier.cc +++ b/net/cert/cert_verifier.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_verifier.h" +#include "net/cert/cert_verifier.h" -#include "net/base/cert_verify_proc.h" -#include "net/base/multi_threaded_cert_verifier.h" +#include "net/cert/cert_verify_proc.h" +#include "net/cert/multi_threaded_cert_verifier.h" namespace net { diff --git a/net/base/cert_verifier.h b/net/cert/cert_verifier.h index 36312d3..01a9918 100644 --- a/net/base/cert_verifier.h +++ b/net/cert/cert_verifier.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_VERIFIER_H_ -#define NET_BASE_CERT_VERIFIER_H_ +#ifndef NET_CERT_CERT_VERIFIER_H_ +#define NET_CERT_CERT_VERIFIER_H_ #include <string> @@ -110,4 +110,4 @@ class NET_EXPORT CertVerifier { } // namespace net -#endif // NET_BASE_CERT_VERIFIER_H_ +#endif // NET_CERT_CERT_VERIFIER_H_ diff --git a/net/base/cert_verify_proc.cc b/net/cert/cert_verify_proc.cc index 0c017c5..a7f56b7 100644 --- a/net/base/cert_verify_proc.cc +++ b/net/cert/cert_verify_proc.cc @@ -2,28 +2,28 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_verify_proc.h" +#include "net/cert/cert_verify_proc.h" #include "base/metrics/histogram.h" #include "base/sha1.h" #include "build/build_config.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_verifier.h" -#include "net/base/cert_verify_result.h" -#include "net/base/crl_set.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/crl_set.h" +#include "net/cert/x509_certificate.h" #if defined(USE_NSS) || defined(OS_IOS) -#include "net/base/cert_verify_proc_nss.h" +#include "net/cert/cert_verify_proc_nss.h" #elif defined(USE_OPENSSL) && !defined(OS_ANDROID) -#include "net/base/cert_verify_proc_openssl.h" +#include "net/cert/cert_verify_proc_openssl.h" #elif defined(OS_ANDROID) -#include "net/base/cert_verify_proc_android.h" +#include "net/cert/cert_verify_proc_android.h" #elif defined(OS_MACOSX) -#include "net/base/cert_verify_proc_mac.h" +#include "net/cert/cert_verify_proc_mac.h" #elif defined(OS_WIN) -#include "net/base/cert_verify_proc_win.h" +#include "net/cert/cert_verify_proc_win.h" #else #error Implement certificate verification. #endif diff --git a/net/base/cert_verify_proc.h b/net/cert/cert_verify_proc.h index 2830874..c85bf75 100644 --- a/net/base/cert_verify_proc.h +++ b/net/cert/cert_verify_proc.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_VERIFY_PROC_H_ -#define NET_BASE_CERT_VERIFY_PROC_H_ +#ifndef NET_CERT_CERT_VERIFY_PROC_H_ +#define NET_CERT_CERT_VERIFY_PROC_H_ #include <string> #include <vector> @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "net/base/net_export.h" -#include "net/base/x509_cert_types.h" +#include "net/cert/x509_cert_types.h" namespace net { @@ -93,4 +93,4 @@ class NET_EXPORT CertVerifyProc } // namespace net -#endif // NET_BASE_CERT_VERIFY_PROC_H_ +#endif // NET_CERT_CERT_VERIFY_PROC_H_ diff --git a/net/base/cert_verify_proc_android.cc b/net/cert/cert_verify_proc_android.cc index c11e66e..71456e2 100644 --- a/net/base/cert_verify_proc_android.cc +++ b/net/cert/cert_verify_proc_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_verify_proc_android.h" +#include "net/cert/cert_verify_proc_android.h" #include <string> #include <vector> @@ -10,10 +10,10 @@ #include "base/logging.h" #include "net/android/cert_verify_result_android.h" #include "net/android/network_library.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_verify_result.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/cert_verify_proc_android.h b/net/cert/cert_verify_proc_android.h index bfd5e12..ca8746b 100644 --- a/net/base/cert_verify_proc_android.h +++ b/net/cert/cert_verify_proc_android.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_VERIFY_PROC_ANDROID_H_ -#define NET_BASE_CERT_VERIFY_PROC_ANDROID_H_ +#ifndef NET_CERT_CERT_VERIFY_PROC_ANDROID_H_ +#define NET_CERT_CERT_VERIFY_PROC_ANDROID_H_ -#include "net/base/cert_verify_proc.h" +#include "net/cert/cert_verify_proc.h" namespace net { @@ -31,4 +31,4 @@ class CertVerifyProcAndroid : public CertVerifyProc { } // namespace net -#endif // NET_BASE_CERT_VERIFY_PROC_ANDROID_H_ +#endif // NET_CERT_CERT_VERIFY_PROC_ANDROID_H_ diff --git a/net/base/cert_verify_proc_mac.cc b/net/cert/cert_verify_proc_mac.cc index a8f3e28..fe2fb9e 100644 --- a/net/base/cert_verify_proc_mac.cc +++ b/net/cert/cert_verify_proc_mac.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_verify_proc_mac.h" +#include "net/cert/cert_verify_proc_mac.h" #include <CommonCrypto/CommonDigest.h> #include <CoreServices/CoreServices.h> @@ -20,16 +20,16 @@ #include "crypto/mac_security_services_lock.h" #include "crypto/nss_util.h" #include "crypto/sha2.h" -#include "net/base/asn1_util.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_verifier.h" -#include "net/base/cert_verify_result.h" -#include "net/base/crl_set.h" #include "net/base/net_errors.h" -#include "net/base/test_root_certs.h" -#include "net/base/x509_certificate.h" -#include "net/base/x509_certificate_known_roots_mac.h" -#include "net/base/x509_util_mac.h" +#include "net/cert/asn1_util.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/crl_set.h" +#include "net/cert/test_root_certs.h" +#include "net/cert/x509_certificate.h" +#include "net/cert/x509_certificate_known_roots_mac.h" +#include "net/cert/x509_util_mac.h" // From 10.7.2 libsecurity_keychain-55035/lib/SecTrustPriv.h, for use with // SecTrustCopyExtendedResult. diff --git a/net/base/cert_verify_proc_mac.h b/net/cert/cert_verify_proc_mac.h index e28ba51..cb55767 100644 --- a/net/base/cert_verify_proc_mac.h +++ b/net/cert/cert_verify_proc_mac.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_VERIFY_PROC_MAC_H_ -#define NET_BASE_CERT_VERIFY_PROC_MAC_H_ +#ifndef NET_CERT_CERT_VERIFY_PROC_MAC_H_ +#define NET_CERT_CERT_VERIFY_PROC_MAC_H_ -#include "net/base/cert_verify_proc.h" +#include "net/cert/cert_verify_proc.h" namespace net { @@ -31,4 +31,4 @@ class CertVerifyProcMac : public CertVerifyProc { } // namespace net -#endif // NET_BASE_CERT_VERIFY_PROC_MAC_H_ +#endif // NET_CERT_CERT_VERIFY_PROC_MAC_H_ diff --git a/net/base/cert_verify_proc_nss.cc b/net/cert/cert_verify_proc_nss.cc index c8c4f39..8a30970 100644 --- a/net/base/cert_verify_proc_nss.cc +++ b/net/cert/cert_verify_proc_nss.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_verify_proc_nss.h" +#include "net/cert/cert_verify_proc_nss.h" #include <string> #include <vector> @@ -18,19 +18,19 @@ #include "crypto/nss_util.h" #include "crypto/scoped_nss_types.h" #include "crypto/sha2.h" -#include "net/base/asn1_util.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_verifier.h" -#include "net/base/cert_verify_result.h" -#include "net/base/crl_set.h" -#include "net/base/ev_root_ca_metadata.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" -#include "net/base/x509_util_nss.h" +#include "net/cert/asn1_util.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/crl_set.h" +#include "net/cert/ev_root_ca_metadata.h" +#include "net/cert/x509_certificate.h" +#include "net/cert/x509_util_nss.h" #if defined(OS_IOS) #include <CommonCrypto/CommonDigest.h> -#include "net/base/x509_util_ios.h" +#include "net/cert/x509_util_ios.h" #endif // defined(OS_IOS) #define NSS_VERSION_NUM (NSS_VMAJOR * 10000 + NSS_VMINOR * 100 + NSS_VPATCH) diff --git a/net/base/cert_verify_proc_nss.h b/net/cert/cert_verify_proc_nss.h index 8dcd235..f8bb853 100644 --- a/net/base/cert_verify_proc_nss.h +++ b/net/cert/cert_verify_proc_nss.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_VERIFY_PROC_NSS_H_ -#define NET_BASE_CERT_VERIFY_PROC_NSS_H_ +#ifndef NET_CERT_CERT_VERIFY_PROC_NSS_H_ +#define NET_CERT_CERT_VERIFY_PROC_NSS_H_ -#include "net/base/cert_verify_proc.h" #include "net/base/net_export.h" +#include "net/cert/cert_verify_proc.h" namespace net { @@ -31,4 +31,4 @@ class NET_EXPORT_PRIVATE CertVerifyProcNSS : public CertVerifyProc { } // namespace net -#endif // NET_BASE_CERT_VERIFY_PROC_NSS_H_ +#endif // NET_CERT_CERT_VERIFY_PROC_NSS_H_ diff --git a/net/base/cert_verify_proc_openssl.cc b/net/cert/cert_verify_proc_openssl.cc index 964ba26..0328599 100644 --- a/net/base/cert_verify_proc_openssl.cc +++ b/net/cert/cert_verify_proc_openssl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_verify_proc_openssl.h" +#include "net/cert/cert_verify_proc_openssl.h" #include <openssl/x509v3.h> @@ -13,12 +13,12 @@ #include "base/sha1.h" #include "crypto/openssl_util.h" #include "crypto/sha2.h" -#include "net/base/asn1_util.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_verifier.h" -#include "net/base/cert_verify_result.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/asn1_util.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/cert_verify_proc_openssl.h b/net/cert/cert_verify_proc_openssl.h index 5777bcc..d0d2574 100644 --- a/net/base/cert_verify_proc_openssl.h +++ b/net/cert/cert_verify_proc_openssl.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_VERIFY_PROC_OPENSSL_H_ -#define NET_BASE_CERT_VERIFY_PROC_OPENSSL_H_ +#ifndef NET_CERT_CERT_VERIFY_PROC_OPENSSL_H_ +#define NET_CERT_CERT_VERIFY_PROC_OPENSSL_H_ -#include "net/base/cert_verify_proc.h" +#include "net/cert/cert_verify_proc.h" namespace net { @@ -30,4 +30,4 @@ class CertVerifyProcOpenSSL : public CertVerifyProc { } // namespace net -#endif // NET_BASE_CERT_VERIFY_PROC_OPENSSL_H_ +#endif // NET_CERT_CERT_VERIFY_PROC_OPENSSL_H_ diff --git a/net/base/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc index 0b0a141..a7e7b8d 100644 --- a/net/base/cert_verify_proc_unittest.cc +++ b/net/cert/cert_verify_proc_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_verify_proc.h" +#include "net/cert/cert_verify_proc.h" #include <vector> @@ -10,17 +10,17 @@ #include "base/logging.h" #include "base/sha1.h" #include "base/string_number_conversions.h" -#include "net/base/asn1_util.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_test_util.h" -#include "net/base/cert_verifier.h" -#include "net/base/cert_verify_result.h" -#include "net/base/crl_set.h" #include "net/base/net_errors.h" -#include "net/base/test_certificate_data.h" #include "net/base/test_data_directory.h" -#include "net/base/test_root_certs.h" -#include "net/base/x509_certificate.h" +#include "net/cert/asn1_util.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/crl_set.h" +#include "net/cert/test_root_certs.h" +#include "net/cert/x509_certificate.h" +#include "net/test/cert_test_util.h" +#include "net/test/test_certificate_data.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) diff --git a/net/base/cert_verify_proc_win.cc b/net/cert/cert_verify_proc_win.cc index 5a1de37..0e48b2d 100644 --- a/net/base/cert_verify_proc_win.cc +++ b/net/cert/cert_verify_proc_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_verify_proc_win.h" +#include "net/cert/cert_verify_proc_win.h" #include <string> #include <vector> @@ -14,16 +14,16 @@ #include "crypto/capi_util.h" #include "crypto/scoped_capi_types.h" #include "crypto/sha2.h" -#include "net/base/asn1_util.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_verifier.h" -#include "net/base/cert_verify_result.h" -#include "net/base/crl_set.h" -#include "net/base/ev_root_ca_metadata.h" #include "net/base/net_errors.h" -#include "net/base/test_root_certs.h" -#include "net/base/x509_certificate.h" -#include "net/base/x509_certificate_known_roots_win.h" +#include "net/cert/asn1_util.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/crl_set.h" +#include "net/cert/ev_root_ca_metadata.h" +#include "net/cert/test_root_certs.h" +#include "net/cert/x509_certificate.h" +#include "net/cert/x509_certificate_known_roots_win.h" #pragma comment(lib, "crypt32.lib") diff --git a/net/base/cert_verify_proc_win.h b/net/cert/cert_verify_proc_win.h index 1db81db..147f47a 100644 --- a/net/base/cert_verify_proc_win.h +++ b/net/cert/cert_verify_proc_win.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_VERIFY_PROC_WIN_H_ -#define NET_BASE_CERT_VERIFY_PROC_WIN_H_ +#ifndef NET_CERT_CERT_VERIFY_PROC_WIN_H_ +#define NET_CERT_CERT_VERIFY_PROC_WIN_H_ -#include "net/base/cert_verify_proc.h" +#include "net/cert/cert_verify_proc.h" namespace net { @@ -31,4 +31,4 @@ class CertVerifyProcWin : public CertVerifyProc { } // namespace net -#endif // NET_BASE_CERT_VERIFY_PROC_WIN_H_ +#endif // NET_CERT_CERT_VERIFY_PROC_WIN_H_ diff --git a/net/base/cert_verify_result.cc b/net/cert/cert_verify_result.cc index 028011ee..f076339 100644 --- a/net/base/cert_verify_result.cc +++ b/net/cert/cert_verify_result.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_verify_result.h" +#include "net/cert/cert_verify_result.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/cert_verify_result.h b/net/cert/cert_verify_result.h index 8758d01..c60e852 100644 --- a/net/base/cert_verify_result.h +++ b/net/cert/cert_verify_result.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_VERIFY_RESULT_H_ -#define NET_BASE_CERT_VERIFY_RESULT_H_ +#ifndef NET_CERT_CERT_VERIFY_RESULT_H_ +#define NET_CERT_CERT_VERIFY_RESULT_H_ #include <vector> -#include "net/base/cert_status_flags.h" -#include "net/base/net_export.h" #include "base/memory/ref_counted.h" -#include "net/base/x509_cert_types.h" +#include "net/base/net_export.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/x509_cert_types.h" namespace net { @@ -63,4 +63,4 @@ class NET_EXPORT CertVerifyResult { } // namespace net -#endif // NET_BASE_CERT_VERIFY_RESULT_H_ +#endif // NET_CERT_CERT_VERIFY_RESULT_H_ diff --git a/net/base/crl_set.cc b/net/cert/crl_set.cc index 735bb5e..bc124fd 100644 --- a/net/base/crl_set.cc +++ b/net/cert/crl_set.cc @@ -12,7 +12,7 @@ #include "base/time.h" #include "base/values.h" #include "crypto/sha2.h" -#include "net/base/crl_set.h" +#include "net/cert/crl_set.h" #include "third_party/zlib/zlib.h" namespace net { diff --git a/net/base/crl_set.h b/net/cert/crl_set.h index cb37934..ae6a2a2 100644 --- a/net/base/crl_set.h +++ b/net/cert/crl_set.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CRL_SET_H_ -#define NET_BASE_CRL_SET_H_ +#ifndef NET_CERT_CRL_SET_H_ +#define NET_CERT_CRL_SET_H_ #include <map> #include <string> @@ -115,4 +115,4 @@ class NET_EXPORT CRLSet : public base::RefCountedThreadSafe<CRLSet> { } // namespace net -#endif // NET_BASE_CRL_SET_H_ +#endif // NET_CERT_CRL_SET_H_ diff --git a/net/base/crl_set_unittest.cc b/net/cert/crl_set_unittest.cc index 42fa82a..88eb654 100644 --- a/net/base/crl_set_unittest.cc +++ b/net/cert/crl_set_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/crl_set.h" +#include "net/cert/crl_set.h" #include "testing/gtest/include/gtest/gtest.h" // These data blocks were generated using a lot of code that is still in diff --git a/net/base/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc index 5c617d7..6ef746b 100644 --- a/net/base/ev_root_ca_metadata.cc +++ b/net/cert/ev_root_ca_metadata.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/ev_root_ca_metadata.h" +#include "net/cert/ev_root_ca_metadata.h" #if defined(USE_NSS) || defined(OS_IOS) #include <cert.h> diff --git a/net/base/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h index 292c5ea..aad7848 100644 --- a/net/base/ev_root_ca_metadata.h +++ b/net/cert/ev_root_ca_metadata.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_EV_ROOT_CA_METADATA_H_ -#define NET_BASE_EV_ROOT_CA_METADATA_H_ +#ifndef NET_CERT_EV_ROOT_CA_METADATA_H_ +#define NET_CERT_EV_ROOT_CA_METADATA_H_ #include "build/build_config.h" @@ -17,7 +17,7 @@ #include <vector> #include "net/base/net_export.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace base { template <typename T> @@ -86,4 +86,4 @@ class NET_EXPORT_PRIVATE EVRootCAMetadata { } // namespace net -#endif // NET_BASE_EV_ROOT_CA_METADATA_H_ +#endif // NET_CERT_EV_ROOT_CA_METADATA_H_ diff --git a/net/base/ev_root_ca_metadata_unittest.cc b/net/cert/ev_root_ca_metadata_unittest.cc index 0389b7d..2c845db 100644 --- a/net/base/ev_root_ca_metadata_unittest.cc +++ b/net/cert/ev_root_ca_metadata_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/ev_root_ca_metadata.h" +#include "net/cert/ev_root_ca_metadata.h" -#include "net/base/cert_test_util.h" -#include "net/base/x509_cert_types.h" +#include "net/cert/x509_cert_types.h" +#include "net/test/cert_test_util.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(USE_NSS) diff --git a/net/base/mock_cert_verifier.cc b/net/cert/mock_cert_verifier.cc index 9006374..976de1a 100644 --- a/net/base/mock_cert_verifier.cc +++ b/net/cert/mock_cert_verifier.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/mock_cert_verifier.h" +#include "net/cert/mock_cert_verifier.h" #include "base/memory/ref_counted.h" #include "base/string_util.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_verify_result.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/mock_cert_verifier.h b/net/cert/mock_cert_verifier.h index d0537c1..5af7b7e 100644 --- a/net/base/mock_cert_verifier.h +++ b/net/cert/mock_cert_verifier.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_MOCK_CERT_VERIFIER_H_ -#define NET_BASE_MOCK_CERT_VERIFIER_H_ +#ifndef NET_CERT_MOCK_CERT_VERIFIER_H_ +#define NET_CERT_MOCK_CERT_VERIFIER_H_ #include <list> -#include "net/base/cert_verifier.h" -#include "net/base/cert_verify_result.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/cert_verify_result.h" namespace net { @@ -66,4 +66,4 @@ class MockCertVerifier : public CertVerifier { } // namespace net -#endif // NET_BASE_MOCK_CERT_VERIFIER_H_ +#endif // NET_CERT_MOCK_CERT_VERIFIER_H_ diff --git a/net/base/multi_threaded_cert_verifier.cc b/net/cert/multi_threaded_cert_verifier.cc index dc01c0e..daac0d0 100644 --- a/net/base/multi_threaded_cert_verifier.cc +++ b/net/cert/multi_threaded_cert_verifier.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/multi_threaded_cert_verifier.h" +#include "net/cert/multi_threaded_cert_verifier.h" #include <algorithm> @@ -13,15 +13,15 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/synchronization/lock.h" -#include "base/time.h" #include "base/threading/worker_pool.h" -#include "net/base/cert_trust_anchor_provider.h" -#include "net/base/cert_verify_proc.h" -#include "net/base/crl_set.h" +#include "base/time.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/x509_certificate.h" -#include "net/base/x509_certificate_net_log_param.h" +#include "net/cert/cert_trust_anchor_provider.h" +#include "net/cert/cert_verify_proc.h" +#include "net/cert/crl_set.h" +#include "net/cert/x509_certificate.h" +#include "net/cert/x509_certificate_net_log_param.h" #if defined(USE_NSS) || defined(OS_IOS) #include <private/pprthred.h> // PR_DetachThread diff --git a/net/base/multi_threaded_cert_verifier.h b/net/cert/multi_threaded_cert_verifier.h index bee577c..bc9cd4f 100644 --- a/net/base/multi_threaded_cert_verifier.h +++ b/net/cert/multi_threaded_cert_verifier.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_MULTI_THREADED_CERT_VERIFIER_H_ -#define NET_BASE_MULTI_THREADED_CERT_VERIFIER_H_ +#ifndef NET_CERT_MULTI_THREADED_CERT_VERIFIER_H_ +#define NET_CERT_MULTI_THREADED_CERT_VERIFIER_H_ #include <map> #include <string> @@ -13,14 +13,14 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" -#include "net/base/cert_database.h" -#include "net/base/cert_verifier.h" -#include "net/base/cert_verify_result.h" #include "net/base/completion_callback.h" #include "net/base/expiring_cache.h" #include "net/base/hash_value.h" #include "net/base/net_export.h" -#include "net/base/x509_cert_types.h" +#include "net/cert/cert_database.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/x509_cert_types.h" namespace net { @@ -166,4 +166,4 @@ class NET_EXPORT_PRIVATE MultiThreadedCertVerifier } // namespace net -#endif // NET_BASE_MULTI_THREADED_CERT_VERIFIER_H_ +#endif // NET_CERT_MULTI_THREADED_CERT_VERIFIER_H_ diff --git a/net/base/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc index 8dea596..19afd2e 100644 --- a/net/base/multi_threaded_cert_verifier_unittest.cc +++ b/net/cert/multi_threaded_cert_verifier_unittest.cc @@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/multi_threaded_cert_verifier.h" +#include "net/cert/multi_threaded_cert_verifier.h" #include "base/bind.h" #include "base/files/file_path.h" #include "base/format_macros.h" #include "base/stringprintf.h" -#include "net/base/cert_test_util.h" -#include "net/base/cert_trust_anchor_provider.h" -#include "net/base/cert_verify_proc.h" -#include "net/base/cert_verify_result.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_trust_anchor_provider.h" +#include "net/cert/cert_verify_proc.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/x509_certificate.h" +#include "net/test/cert_test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/nss_cert_database.cc b/net/cert/nss_cert_database.cc index 1cfb212..651b521 100644 --- a/net/base/nss_cert_database.cc +++ b/net/cert/nss_cert_database.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/nss_cert_database.h" +#include "net/cert/nss_cert_database.h" #include <cert.h> #include <certdb.h> @@ -16,10 +16,10 @@ #include "base/observer_list_threadsafe.h" #include "crypto/nss_util.h" #include "crypto/nss_util_internal.h" -#include "net/base/cert_database.h" #include "net/base/crypto_module.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/third_party/mozilla_security_manager/nsNSSCertificateDB.h" #include "net/third_party/mozilla_security_manager/nsPKCS12Blob.h" diff --git a/net/base/nss_cert_database.h b/net/cert/nss_cert_database.h index ae8c155..43d59ea 100644 --- a/net/base/nss_cert_database.h +++ b/net/cert/nss_cert_database.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_NSS_CERT_DATABASE_H_ -#define NET_BASE_NSS_CERT_DATABASE_H_ +#ifndef NET_CERT_NSS_CERT_DATABASE_H_ +#define NET_CERT_NSS_CERT_DATABASE_H_ #include <string> #include <vector> @@ -11,9 +11,9 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "net/base/cert_type.h" #include "net/base/net_export.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_type.h" +#include "net/cert/x509_certificate.h" template <typename T> struct DefaultSingletonTraits; template <class ObserverType> class ObserverListThreadSafe; @@ -205,4 +205,4 @@ class NET_EXPORT NSSCertDatabase { } // namespace net -#endif // NET_BASE_NSS_CERT_DATABASE_H_ +#endif // NET_CERT_NSS_CERT_DATABASE_H_ diff --git a/net/base/nss_cert_database_unittest.cc b/net/cert/nss_cert_database_unittest.cc index 8564ec7..2b3f3f3 100644 --- a/net/base/nss_cert_database_unittest.cc +++ b/net/cert/nss_cert_database_unittest.cc @@ -19,15 +19,15 @@ #include "crypto/nss_util.h" #include "crypto/nss_util_internal.h" #include "crypto/scoped_nss_types.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_test_util.h" -#include "net/base/cert_verify_proc_nss.h" -#include "net/base/cert_verify_result.h" #include "net/base/crypto_module.h" #include "net/base/net_errors.h" -#include "net/base/nss_cert_database.h" #include "net/base/test_data_directory.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verify_proc_nss.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/nss_cert_database.h" +#include "net/cert/x509_certificate.h" +#include "net/test/cert_test_util.h" #include "net/third_party/mozilla_security_manager/nsNSSCertificateDB.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/pem_tokenizer.cc b/net/cert/pem_tokenizer.cc index c79eec1..bb64255 100644 --- a/net/base/pem_tokenizer.cc +++ b/net/cert/pem_tokenizer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/pem_tokenizer.h" +#include "net/cert/pem_tokenizer.h" #include "base/base64.h" #include "base/string_util.h" diff --git a/net/base/pem_tokenizer.h b/net/cert/pem_tokenizer.h index ea1fae9..13d2817 100644 --- a/net/base/pem_tokenizer.h +++ b/net/cert/pem_tokenizer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_PEM_TOKENIZER_H_ -#define NET_BASE_PEM_TOKENIZER_H_ +#ifndef NET_CERT_PEM_TOKENIZER_H_ +#define NET_CERT_PEM_TOKENIZER_H_ #include <string> #include <vector> @@ -74,4 +74,4 @@ class NET_EXPORT_PRIVATE PEMTokenizer { } // namespace net -#endif // NET_BASE_PEM_TOKENIZER_H_ +#endif // NET_CERT_PEM_TOKENIZER_H_ diff --git a/net/base/pem_tokenizer_unittest.cc b/net/cert/pem_tokenizer_unittest.cc index af2446c..d5334db 100644 --- a/net/base/pem_tokenizer_unittest.cc +++ b/net/cert/pem_tokenizer_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/pem_tokenizer.h" +#include "net/cert/pem_tokenizer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/single_request_cert_verifier.cc b/net/cert/single_request_cert_verifier.cc index 1777945..909af07 100644 --- a/net/base/single_request_cert_verifier.cc +++ b/net/cert/single_request_cert_verifier.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/single_request_cert_verifier.h" +#include "net/cert/single_request_cert_verifier.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/single_request_cert_verifier.h b/net/cert/single_request_cert_verifier.h index 29d9f04..6b19281 100644 --- a/net/base/single_request_cert_verifier.h +++ b/net/cert/single_request_cert_verifier.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_SINGLE_REQUEST_CERT_VERIFIER_H_ -#define NET_BASE_SINGLE_REQUEST_CERT_VERIFIER_H_ +#ifndef NET_CERT_SINGLE_REQUEST_CERT_VERIFIER_H_ +#define NET_CERT_SINGLE_REQUEST_CERT_VERIFIER_H_ -#include "net/base/cert_verifier.h" +#include "net/cert/cert_verifier.h" namespace net { @@ -49,4 +49,4 @@ class SingleRequestCertVerifier { } // namespace net -#endif // NET_BASE_SINGLE_REQUEST_CERT_VERIFIER_H_ +#endif // NET_CERT_SINGLE_REQUEST_CERT_VERIFIER_H_ diff --git a/net/base/test_root_certs.cc b/net/cert/test_root_certs.cc index 084bbef..3c77ea5 100644 --- a/net/base/test_root_certs.cc +++ b/net/cert/test_root_certs.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/test_root_certs.h" +#include "net/cert/test_root_certs.h" #include <string> #include "base/file_util.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/test_root_certs.h b/net/cert/test_root_certs.h index a7c7cde..543adbd 100644 --- a/net/base/test_root_certs.h +++ b/net/cert/test_root_certs.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_TEST_ROOT_CERTS_H_ -#define NET_BASE_TEST_ROOT_CERTS_H_ +#ifndef NET_CERT_TEST_ROOT_CERTS_H_ +#define NET_CERT_TEST_ROOT_CERTS_H_ #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" @@ -124,4 +124,4 @@ class NET_EXPORT_PRIVATE ScopedTestRoot { } // namespace net -#endif // NET_BASE_TEST_ROOT_CERTS_H_ +#endif // NET_CERT_TEST_ROOT_CERTS_H_ diff --git a/net/base/test_root_certs_android.cc b/net/cert/test_root_certs_android.cc index 5ad185f..a7b80c4 100644 --- a/net/base/test_root_certs_android.cc +++ b/net/cert/test_root_certs_android.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/test_root_certs.h" +#include "net/cert/test_root_certs.h" #include "base/location.h" #include "base/logging.h" #include "net/android/network_library.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/test_root_certs_mac.cc b/net/cert/test_root_certs_mac.cc index a2bb5b8..475fb24 100644 --- a/net/base/test_root_certs_mac.cc +++ b/net/cert/test_root_certs_mac.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/test_root_certs.h" +#include "net/cert/test_root_certs.h" #include <Security/Security.h> #include "base/logging.h" #include "base/mac/scoped_cftyperef.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/test_root_certs_nss.cc b/net/cert/test_root_certs_nss.cc index 039b790..3a2f88a 100644 --- a/net/base/test_root_certs_nss.cc +++ b/net/cert/test_root_certs_nss.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/test_root_certs.h" +#include "net/cert/test_root_certs.h" #include <cert.h> #include "base/logging.h" #include "base/stl_util.h" #include "crypto/nss_util.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #if defined(OS_IOS) -#include "net/base/x509_util_ios.h" +#include "net/cert/x509_util_ios.h" #endif namespace net { diff --git a/net/base/test_root_certs_openssl.cc b/net/cert/test_root_certs_openssl.cc index e01d5c9..3d5cf3d 100644 --- a/net/base/test_root_certs_openssl.cc +++ b/net/cert/test_root_certs_openssl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/test_root_certs.h" +#include "net/cert/test_root_certs.h" #include <openssl/err.h> #include <openssl/x509v3.h> @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/logging.h" #include "crypto/openssl_util.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/test_root_certs_win.cc b/net/cert/test_root_certs_win.cc index 05f3d4a..90a21d6 100644 --- a/net/base/test_root_certs_win.cc +++ b/net/cert/test_root_certs_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/test_root_certs.h" +#include "net/cert/test_root_certs.h" #include <windows.h> #include <wincrypt.h> @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/win/win_util.h" #include "base/win/windows_version.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/x509_cert_types.cc b/net/cert/x509_cert_types.cc index 643454f..04dbd6b 100644 --- a/net/base/x509_cert_types.cc +++ b/net/cert/x509_cert_types.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_cert_types.h" +#include "net/cert/x509_cert_types.h" #include <cstdlib> #include <cstring> @@ -11,7 +11,7 @@ #include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/time.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/x509_cert_types.h b/net/cert/x509_cert_types.h index 8ebc477..4b17310 100644 --- a/net/base/x509_cert_types.h +++ b/net/cert/x509_cert_types.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_X509_CERT_TYPES_H_ -#define NET_BASE_X509_CERT_TYPES_H_ +#ifndef NET_CERT_X509_CERT_TYPES_H_ +#define NET_CERT_X509_CERT_TYPES_H_ #include <string.h> @@ -135,4 +135,4 @@ bool ParseCertificateDate(const base::StringPiece& raw_date, base::Time* time); } // namespace net -#endif // NET_BASE_X509_CERT_TYPES_H_ +#endif // NET_CERT_X509_CERT_TYPES_H_ diff --git a/net/base/x509_cert_types_mac.cc b/net/cert/x509_cert_types_mac.cc index a3eec5e..00795ed 100644 --- a/net/base/x509_cert_types_mac.cc +++ b/net/cert/x509_cert_types_mac.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_cert_types.h" +#include "net/cert/x509_cert_types.h" #include <CoreServices/CoreServices.h> -#include <Security/Security.h> #include <Security/SecAsn1Coder.h> +#include <Security/Security.h> -#include "base/logging.h" #include "base/i18n/icu_string_conversions.h" +#include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/utf_string_conversions.h" diff --git a/net/base/x509_cert_types_unittest.cc b/net/cert/x509_cert_types_unittest.cc index 5e66267..e0bcc70 100644 --- a/net/base/x509_cert_types_unittest.cc +++ b/net/cert/x509_cert_types_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "net/base/test_certificate_data.h" -#include "net/base/x509_cert_types.h" +#include "net/cert/x509_cert_types.h" +#include "net/test/test_certificate_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/x509_cert_types_win.cc b/net/cert/x509_cert_types_win.cc index 0db63b1..7b99bec 100644 --- a/net/base/x509_cert_types_win.cc +++ b/net/cert/x509_cert_types_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_cert_types.h" +#include "net/cert/x509_cert_types.h" #include <windows.h> #include <wincrypt.h> diff --git a/net/base/x509_certificate.cc b/net/cert/x509_certificate.cc index 29b11a8..cc3b4cd 100644 --- a/net/base/x509_certificate.cc +++ b/net/cert/x509_certificate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include <stdlib.h> @@ -24,7 +24,7 @@ #include "base/time.h" #include "googleurl/src/url_canon_ip.h" #include "net/base/net_util.h" -#include "net/base/pem_tokenizer.h" +#include "net/cert/pem_tokenizer.h" namespace net { diff --git a/net/base/x509_certificate.h b/net/cert/x509_certificate.h index ade9655..16f4d8d 100644 --- a/net/base/x509_certificate.h +++ b/net/cert/x509_certificate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_X509_CERTIFICATE_H_ -#define NET_BASE_X509_CERTIFICATE_H_ +#ifndef NET_CERT_X509_CERTIFICATE_H_ +#define NET_CERT_X509_CERTIFICATE_H_ #include <string.h> @@ -14,9 +14,9 @@ #include "base/memory/ref_counted.h" #include "base/string_piece.h" #include "base/time.h" -#include "net/base/cert_type.h" #include "net/base/net_export.h" -#include "net/base/x509_cert_types.h" +#include "net/cert/cert_type.h" +#include "net/cert/x509_cert_types.h" #if defined(OS_WIN) #include <windows.h> @@ -507,4 +507,4 @@ class NET_EXPORT X509Certificate } // namespace net -#endif // NET_BASE_X509_CERTIFICATE_H_ +#endif // NET_CERT_X509_CERTIFICATE_H_ diff --git a/net/base/x509_certificate_ios.cc b/net/cert/x509_certificate_ios.cc index 91ae799..042f6d5 100644 --- a/net/base/x509_certificate_ios.cc +++ b/net/cert/x509_certificate_ios.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include <CommonCrypto/CommonDigest.h> #include <Security/Security.h> #include <vector> -#include <cryptohi.h> #include <cert.h> +#include <cryptohi.h> #include <keyhi.h> #include <nss.h> #include <pk11pub.h> @@ -27,13 +27,13 @@ #include "base/time.h" #include "crypto/nss_util.h" #include "crypto/scoped_nss_types.h" -#include "net/base/asn1_util.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_verify_result.h" -#include "net/base/ev_root_ca_metadata.h" #include "net/base/net_errors.h" -#include "net/base/x509_util_ios.h" -#include "net/base/x509_util_nss.h" +#include "net/cert/asn1_util.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/ev_root_ca_metadata.h" +#include "net/cert/x509_util_ios.h" +#include "net/cert/x509_util_nss.h" using base::mac::ScopedCFTypeRef; diff --git a/net/base/x509_certificate_known_roots_mac.h b/net/cert/x509_certificate_known_roots_mac.h index fa2081a..db5403e 100644 --- a/net/base/x509_certificate_known_roots_mac.h +++ b/net/cert/x509_certificate_known_roots_mac.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_X509_CERTIFICATE_KNOWN_ROOTS_MAC_H_ -#define NET_BASE_X509_CERTIFICATE_KNOWN_ROOTS_MAC_H_ +#ifndef NET_CERT_X509_CERTIFICATE_KNOWN_ROOTS_MAC_H_ +#define NET_CERT_X509_CERTIFICATE_KNOWN_ROOTS_MAC_H_ // This is the set of Apple trusted roots from OS X 10.6. // They were taken by exporting the trusted roots from the Keychain utility. @@ -339,4 +339,4 @@ static uint8 kKnownRootCertSHA1Hashes[][20] = { 0x3d, 0xd8, 0x90, 0x8f, 0xfd, 0x28, 0x86, 0x65, 0x64, 0x7d}, }; -#endif // NET_BASE_X509_CERTIFICATE_KNOWN_ROOTS_MAC_H_ +#endif // NET_CERT_X509_CERTIFICATE_KNOWN_ROOTS_MAC_H_ diff --git a/net/base/x509_certificate_known_roots_win.h b/net/cert/x509_certificate_known_roots_win.h index b81613c3..f872413 100644 --- a/net/base/x509_certificate_known_roots_win.h +++ b/net/cert/x509_certificate_known_roots_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_X509_CERTIFICATE_KNOWN_ROOTS_WIN_H_ -#define NET_BASE_X509_CERTIFICATE_KNOWN_ROOTS_WIN_H_ +#ifndef NET_CERT_X509_CERTIFICATE_KNOWN_ROOTS_WIN_H_ +#define NET_CERT_X509_CERTIFICATE_KNOWN_ROOTS_WIN_H_ // This is the set of 318 Microsoft trusted roots from 1st April 2011. // Extracted from @@ -652,4 +652,4 @@ static uint8 kKnownRootCertSHA1Hashes[][20] = { 0x3d, 0xd8, 0x90, 0x8f, 0xfd, 0x28, 0x86, 0x65, 0x64, 0x7d}, }; -#endif // NET_BASE_X509_CERTIFICATE_KNOWN_ROOTS_WIN_H_ +#endif // NET_CERT_X509_CERTIFICATE_KNOWN_ROOTS_WIN_H_ diff --git a/net/base/x509_certificate_mac.cc b/net/cert/x509_certificate_mac.cc index fb6ffa9..4f4d9ff 100644 --- a/net/base/x509_certificate_mac.cc +++ b/net/cert/x509_certificate_mac.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include <CommonCrypto/CommonDigest.h> #include <CoreServices/CoreServices.h> @@ -25,7 +25,7 @@ #include "crypto/mac_security_services_lock.h" #include "crypto/nss_util.h" #include "crypto/rsa_private_key.h" -#include "net/base/x509_util_mac.h" +#include "net/cert/x509_util_mac.h" #include "third_party/nss/mozilla/security/nss/lib/certdb/cert.h" using base::mac::ScopedCFTypeRef; diff --git a/net/base/x509_certificate_net_log_param.cc b/net/cert/x509_certificate_net_log_param.cc index e3a7db9..3c52b96 100644 --- a/net/base/x509_certificate_net_log_param.cc +++ b/net/cert/x509_certificate_net_log_param.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_certificate_net_log_param.h" +#include "net/cert/x509_certificate_net_log_param.h" #include <string> #include <vector> #include "base/values.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/x509_certificate_net_log_param.h b/net/cert/x509_certificate_net_log_param.h index 36ae8f5..36ae8f5 100644 --- a/net/base/x509_certificate_net_log_param.h +++ b/net/cert/x509_certificate_net_log_param.h diff --git a/net/base/x509_certificate_nss.cc b/net/cert/x509_certificate_nss.cc index 2fe571d..f6fdd94 100644 --- a/net/base/x509_certificate_nss.cc +++ b/net/cert/x509_certificate_nss.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include <cert.h> #include <cryptohi.h> @@ -21,7 +21,7 @@ #include "crypto/nss_util.h" #include "crypto/rsa_private_key.h" #include "crypto/scoped_nss_types.h" -#include "net/base/x509_util_nss.h" +#include "net/cert/x509_util_nss.h" namespace net { diff --git a/net/base/x509_certificate_openssl.cc b/net/cert/x509_certificate_openssl.cc index 13f645a..7f77d55 100644 --- a/net/base/x509_certificate_openssl.cc +++ b/net/cert/x509_certificate_openssl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include <openssl/asn1.h> #include <openssl/crypto.h> @@ -21,7 +21,7 @@ #include "crypto/openssl_util.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" -#include "net/base/x509_util_openssl.h" +#include "net/cert/x509_util_openssl.h" #if defined(OS_ANDROID) #include "base/logging.h" diff --git a/net/base/x509_certificate_unittest.cc b/net/cert/x509_certificate_unittest.cc index f66d6f0..6e10439 100644 --- a/net/base/x509_certificate_unittest.cc +++ b/net/cert/x509_certificate_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "base/basictypes.h" #include "base/files/file_path.h" @@ -12,11 +12,11 @@ #include "base/string_number_conversions.h" #include "base/strings/string_split.h" #include "crypto/rsa_private_key.h" -#include "net/base/asn1_util.h" -#include "net/base/cert_test_util.h" #include "net/base/net_errors.h" -#include "net/base/test_certificate_data.h" #include "net/base/test_data_directory.h" +#include "net/cert/asn1_util.h" +#include "net/test/cert_test_util.h" +#include "net/test/test_certificate_data.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(USE_NSS) diff --git a/net/base/x509_certificate_win.cc b/net/cert/x509_certificate_win.cc index 8a83e41..6a72328 100644 --- a/net/base/x509_certificate_win.cc +++ b/net/cert/x509_certificate_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include <blapi.h> // Implement CalculateChainFingerprint() with NSS. diff --git a/net/base/x509_util.cc b/net/cert/x509_util.cc index 2e09a0f..4dbadb1 100644 --- a/net/base/x509_util.cc +++ b/net/cert/x509_util.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_util.h" +#include "net/cert/x509_util.h" #include "base/time.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/x509_util.h b/net/cert/x509_util.h index 734eebd..50ffc7f 100644 --- a/net/base/x509_util.h +++ b/net/cert/x509_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_X509_UTIL_H_ -#define NET_BASE_X509_UTIL_H_ +#ifndef NET_CERT_X509_UTIL_H_ +#define NET_CERT_X509_UTIL_H_ #include <string> @@ -70,4 +70,4 @@ class NET_EXPORT_PRIVATE ClientCertSorter { } // namespace net -#endif // NET_BASE_X509_UTIL_H_ +#endif // NET_CERT_X509_UTIL_H_ diff --git a/net/base/x509_util_ios.cc b/net/cert/x509_util_ios.cc index 66fc2aa..5de6d19 100644 --- a/net/base/x509_util_ios.cc +++ b/net/cert/x509_util_ios.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_util_ios.h" +#include "net/cert/x509_util_ios.h" #include <cert.h> #include <CommonCrypto/CommonDigest.h> @@ -11,8 +11,8 @@ #include "base/mac/scoped_cftyperef.h" #include "crypto/nss_util.h" -#include "net/base/x509_certificate.h" -#include "net/base/x509_util_nss.h" +#include "net/cert/x509_certificate.h" +#include "net/cert/x509_util_nss.h" using base::mac::ScopedCFTypeRef; diff --git a/net/base/x509_util_ios.h b/net/cert/x509_util_ios.h index 1f242ed..5a8a576 100644 --- a/net/base/x509_util_ios.h +++ b/net/cert/x509_util_ios.h @@ -5,13 +5,13 @@ // This file contains functions for iOS to glue NSS and Security.framework // together. -#ifndef NET_BASE_X509_UTIL_IOS_H_ -#define NET_BASE_X509_UTIL_IOS_H_ +#ifndef NET_CERT_X509_UTIL_IOS_H_ +#define NET_CERT_X509_UTIL_IOS_H_ #include <Security/Security.h> #include <vector> -#include "net/base/x509_cert_types.h" +#include "net/cert/x509_cert_types.h" // Forward declaration; real one in <cert.h> typedef struct CERTCertificateStr CERTCertificate; @@ -69,4 +69,4 @@ class NSSCertChain { } // namespace x509_util_ios } // namespace net -#endif // NET_BASE_X509_UTIL_IOS_H_ +#endif // NET_CERT_X509_UTIL_IOS_H_ diff --git a/net/base/x509_util_mac.cc b/net/cert/x509_util_mac.cc index a53b5ac..c9aa37b 100644 --- a/net/base/x509_util_mac.cc +++ b/net/cert/x509_util_mac.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_util_mac.h" +#include "net/cert/x509_util_mac.h" #include "base/logging.h" #include "third_party/apple_apsl/cssmapplePriv.h" diff --git a/net/base/x509_util_mac.h b/net/cert/x509_util_mac.h index 9272bc7..caf7a28 100644 --- a/net/base/x509_util_mac.h +++ b/net/cert/x509_util_mac.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_X509_UTIL_MAC_H_ -#define NET_BASE_X509_UTIL_MAC_H_ +#ifndef NET_CERT_X509_UTIL_MAC_H_ +#define NET_CERT_X509_UTIL_MAC_H_ #include <CoreFoundation/CFArray.h> #include <Security/Security.h> @@ -136,4 +136,4 @@ class CSSMCachedCertificate { } // namespace net -#endif // NET_BASE_X509_UTIL_MAC_H_ +#endif // NET_CERT_X509_UTIL_MAC_H_ diff --git a/net/base/x509_util_nss.cc b/net/cert/x509_util_nss.cc index f4c253f..90b7487 100644 --- a/net/base/x509_util_nss.cc +++ b/net/cert/x509_util_nss.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_util.h" -#include "net/base/x509_util_nss.h" +#include "net/cert/x509_util.h" +#include "net/cert/x509_util_nss.h" #include <cert.h> #include <cryptohi.h> @@ -24,7 +24,7 @@ #include "crypto/nss_util_internal.h" #include "crypto/scoped_nss_types.h" #include "crypto/third_party/nss/chromium-nss.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/base/x509_util_nss.h b/net/cert/x509_util_nss.h index f40c503..66c634c 100644 --- a/net/base/x509_util_nss.h +++ b/net/cert/x509_util_nss.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_X509_UTIL_NSS_H_ -#define NET_BASE_X509_UTIL_NSS_H_ +#ifndef NET_CERT_X509_UTIL_NSS_H_ +#define NET_CERT_X509_UTIL_NSS_H_ #include <string> #include <vector> #include "base/time.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" class PickleIterator; @@ -98,4 +98,4 @@ bool IsCertificateIssuedBy(const std::vector<CERTCertificate*>& cert_chain, } // namespace net -#endif // NET_BASE_X509_UTIL_NSS_H_ +#endif // NET_CERT_X509_UTIL_NSS_H_ diff --git a/net/base/x509_util_nss_unittest.cc b/net/cert/x509_util_nss_unittest.cc index c0dfd42..968cc14 100644 --- a/net/base/x509_util_nss_unittest.cc +++ b/net/cert/x509_util_nss_unittest.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_util.h" -#include "net/base/x509_util_nss.h" +#include "net/cert/x509_util.h" +#include "net/cert/x509_util_nss.h" #include <cert.h> #include <secoid.h> -#include "base/memory/scoped_ptr.h" #include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "crypto/ec_private_key.h" #include "crypto/scoped_nss_types.h" #include "crypto/signature_verifier.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/x509_util_openssl.cc b/net/cert/x509_util_openssl.cc index 142bf77..5853b64 100644 --- a/net/base/x509_util_openssl.cc +++ b/net/cert/x509_util_openssl.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_util.h" -#include "net/base/x509_util_openssl.h" +#include "net/cert/x509_util.h" +#include "net/cert/x509_util_openssl.h" #include <algorithm> #include "base/logging.h" #include "base/string_piece.h" -#include "net/base/x509_cert_types.h" +#include "net/cert/x509_cert_types.h" namespace net { diff --git a/net/base/x509_util_openssl.h b/net/cert/x509_util_openssl.h index ad51425..ec45380 100644 --- a/net/base/x509_util_openssl.h +++ b/net/cert/x509_util_openssl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_X509_UTIL_OPENSSL_H_ -#define NET_BASE_X509_UTIL_OPENSSL_H_ +#ifndef NET_CERT_X509_UTIL_OPENSSL_H_ +#define NET_CERT_X509_UTIL_OPENSSL_H_ #include <openssl/asn1.h> #include <openssl/x509v3.h> @@ -42,4 +42,4 @@ bool NET_EXPORT ParseDate(ASN1_TIME* x509_time, base::Time* time); } // namespace net -#endif // NET_BASE_X509_UTIL_OPENSSL_H_ +#endif // NET_CERT_X509_UTIL_OPENSSL_H_ diff --git a/net/base/x509_util_openssl_unittest.cc b/net/cert/x509_util_openssl_unittest.cc index eea3984..f237602 100644 --- a/net/base/x509_util_openssl_unittest.cc +++ b/net/cert/x509_util_openssl_unittest.cc @@ -4,8 +4,8 @@ #include "base/memory/scoped_ptr.h" #include "crypto/ec_private_key.h" -#include "net/base/x509_util.h" -#include "net/base/x509_util_openssl.h" +#include "net/cert/x509_util.h" +#include "net/cert/x509_util_openssl.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/x509_util_unittest.cc b/net/cert/x509_util_unittest.cc index 34c1781..ee42f1c 100644 --- a/net/base/x509_util_unittest.cc +++ b/net/cert/x509_util_unittest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/x509_util.h" +#include "net/cert/x509_util.h" #include <algorithm> #include "base/time.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index 491f2f3..5ecdb47 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -21,13 +21,13 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/time.h" -#include "net/base/cert_status_flags.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/upload_data_stream.h" +#include "net/cert/cert_status_flags.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_request_info.h" diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc index ed4524f..585e457 100644 --- a/net/http/http_cache_unittest.cc +++ b/net/http/http_cache_unittest.cc @@ -11,13 +11,13 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "net/base/cache_type.h" -#include "net/base/cert_status_flags.h" #include "net/base/host_port_pair.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/base/net_log_unittest.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" +#include "net/cert/cert_status_flags.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_byte_range.h" #include "net/http/http_request_headers.h" diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc index b0bfd79..ecd33e9 100644 --- a/net/http/http_network_layer_unittest.cc +++ b/net/http/http_network_layer_unittest.cc @@ -4,8 +4,8 @@ #include "net/http/http_network_layer.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/net_log.h" +#include "net/cert/mock_cert_verifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index ea45e12..4e8d867 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -21,12 +21,10 @@ #include "base/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/capturing_net_log.h" -#include "net/base/cert_test_util.h" #include "net/base/completion_callback.h" #include "net/base/host_cache.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" @@ -35,6 +33,7 @@ #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" +#include "net/cert/mock_cert_verifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_digest.h" #include "net/http/http_auth_handler_mock.h" @@ -60,6 +59,7 @@ #include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_config_service_defaults.h" #include "net/ssl/ssl_info.h" +#include "net/test/cert_test_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc index 095cfc5..e378270 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -21,12 +21,10 @@ #include "base/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/capturing_net_log.h" -#include "net/base/cert_test_util.h" #include "net/base/completion_callback.h" #include "net/base/host_cache.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" @@ -35,6 +33,7 @@ #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" +#include "net/cert/mock_cert_verifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_digest.h" #include "net/http/http_auth_handler_mock.h" @@ -60,6 +59,7 @@ #include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_config_service_defaults.h" #include "net/ssl/ssl_info.h" +#include "net/test/cert_test_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc index 58ea3d9..e50a46f 100644 --- a/net/http/http_response_info.cc +++ b/net/http/http_response_info.cc @@ -10,7 +10,7 @@ #include "net/base/auth.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "net/http/http_response_headers.h" #include "net/ssl/ssl_cert_request_info.h" diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc index f720e4f..0a9437f 100644 --- a/net/http/http_stream_factory_impl_unittest.cc +++ b/net/http/http_stream_factory_impl_unittest.cc @@ -7,9 +7,9 @@ #include <string> #include "base/basictypes.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/net_log.h" #include "net/base/test_completion_callback.h" +#include "net/cert/mock_cert_verifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc index 05ec5a9..08d1f8a 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc @@ -31,8 +31,8 @@ #include "crypto/sha2.h" #include "googleurl/src/gurl.h" #include "net/base/dns_util.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_security_headers.h" #include "net/ssl/ssl_info.h" diff --git a/net/http/transport_security_state.h b/net/http/transport_security_state.h index ad05b22..a4e3f33 100644 --- a/net/http/transport_security_state.h +++ b/net/http/transport_security_state.h @@ -15,8 +15,8 @@ #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "net/base/net_export.h" -#include "net/base/x509_certificate.h" -#include "net/base/x509_cert_types.h" +#include "net/cert/x509_cert_types.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/http/transport_security_state_unittest.cc b/net/http/transport_security_state_unittest.cc index 1d8682e..d4fac45 100644 --- a/net/http/transport_security_state_unittest.cc +++ b/net/http/transport_security_state_unittest.cc @@ -13,19 +13,19 @@ #include "base/sha1.h" #include "base/string_piece.h" #include "crypto/sha2.h" -#include "net/base/asn1_util.h" -#include "net/base/cert_test_util.h" -#include "net/base/cert_verifier.h" -#include "net/base/cert_verify_result.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" -#include "net/base/test_root_certs.h" -#include "net/base/x509_cert_types.h" -#include "net/base/x509_certificate.h" +#include "net/cert/asn1_util.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/test_root_certs.h" +#include "net/cert/x509_cert_types.h" +#include "net/cert/x509_certificate.h" #include "net/http/http_util.h" #include "net/ssl/ssl_info.h" +#include "net/test/cert_test_util.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(USE_OPENSSL) diff --git a/net/net.gyp b/net/net.gyp index 544bb15..94c9e3c 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -83,8 +83,6 @@ 'base/address_list.h', 'base/address_tracker_linux.cc', 'base/address_tracker_linux.h', - 'base/asn1_util.cc', - 'base/asn1_util.h', 'base/auth.cc', 'base/auth.h', 'base/backoff_entry.cc', @@ -94,38 +92,9 @@ 'base/big_endian.cc', 'base/big_endian.h', 'base/cache_type.h', - 'base/cert_database.cc', - 'base/cert_database.h', - 'base/cert_database_android.cc', - 'base/cert_database_ios.cc', - 'base/cert_database_mac.cc', - 'base/cert_database_nss.cc', - 'base/cert_database_openssl.cc', - 'base/cert_database_win.cc', - 'base/cert_status_flags.cc', - 'base/cert_status_flags.h', - 'base/cert_trust_anchor_provider.h', - 'base/cert_verifier.cc', - 'base/cert_verifier.h', - 'base/cert_verify_proc.cc', - 'base/cert_verify_proc.h', - 'base/cert_verify_proc_android.cc', - 'base/cert_verify_proc_android.h', - 'base/cert_verify_proc_mac.cc', - 'base/cert_verify_proc_mac.h', - 'base/cert_verify_proc_nss.cc', - 'base/cert_verify_proc_nss.h', - 'base/cert_verify_proc_openssl.cc', - 'base/cert_verify_proc_openssl.h', - 'base/cert_verify_proc_win.cc', - 'base/cert_verify_proc_win.h', - 'base/cert_verify_result.cc', - 'base/cert_verify_result.h', 'base/completion_callback.h', 'base/connection_type_histograms.cc', 'base/connection_type_histograms.h', - 'base/crl_set.cc', - 'base/crl_set.h', 'base/crypto_module.h', 'base/crypto_module_nss.cc', 'base/crypto_module_openssl.cc', @@ -139,8 +108,6 @@ 'base/dns_util.h', 'base/escape.cc', 'base/escape.h', - 'base/ev_root_ca_metadata.cc', - 'base/ev_root_ca_metadata.h', 'base/expiring_cache.h', 'base/file_stream.cc', 'base/file_stream.h', @@ -192,8 +159,6 @@ 'base/mime_sniffer.h', 'base/mime_util.cc', 'base/mime_util.h', - 'base/multi_threaded_cert_verifier.cc', - 'base/multi_threaded_cert_verifier.h', 'base/net_error_list.h', 'base/net_errors.cc', 'base/net_errors.h', @@ -223,8 +188,6 @@ 'base/network_config_watcher_mac.h', 'base/network_delegate.cc', 'base/network_delegate.h', - 'base/nss_cert_database.cc', - 'base/nss_cert_database.h', 'base/nss_memio.c', 'base/nss_memio.h', 'base/openssl_client_key_store.cc', @@ -232,8 +195,6 @@ 'base/openssl_private_key_store.h', 'base/openssl_private_key_store_android.cc', 'base/openssl_private_key_store_memory.cc', - 'base/pem_tokenizer.cc', - 'base/pem_tokenizer.h', 'base/platform_mime_util.h', # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 'base/platform_mime_util_linux.cc', @@ -250,8 +211,6 @@ 'base/sdch_filter.h', 'base/sdch_manager.cc', 'base/sdch_manager.h', - 'base/single_request_cert_verifier.cc', - 'base/single_request_cert_verifier.h', 'base/static_cookie_policy.cc', 'base/static_cookie_policy.h', 'base/stream_listen_socket.cc', @@ -261,13 +220,6 @@ 'base/tcp_listen_socket.h', 'base/test_data_stream.cc', 'base/test_data_stream.h', - 'base/test_root_certs.cc', - 'base/test_root_certs.h', - 'base/test_root_certs_mac.cc', - 'base/test_root_certs_nss.cc', - 'base/test_root_certs_openssl.cc', - 'base/test_root_certs_android.cc', - 'base/test_root_certs_win.cc', 'base/unix_domain_socket_posix.cc', 'base/unix_domain_socket_posix.h', 'base/upload_bytes_element_reader.cc', @@ -289,31 +241,79 @@ 'base/winsock_init.h', 'base/winsock_util.cc', 'base/winsock_util.h', - 'base/x509_cert_types.cc', - 'base/x509_cert_types.h', - 'base/x509_cert_types_mac.cc', - 'base/x509_cert_types_win.cc', - 'base/x509_certificate.cc', - 'base/x509_certificate.h', - 'base/x509_certificate_ios.cc', - 'base/x509_certificate_mac.cc', - 'base/x509_certificate_net_log_param.cc', - 'base/x509_certificate_net_log_param.h', - 'base/x509_certificate_nss.cc', - 'base/x509_certificate_openssl.cc', - 'base/x509_certificate_win.cc', - 'base/x509_util.h', - 'base/x509_util.cc', - 'base/x509_util_ios.cc', - 'base/x509_util_ios.h', - 'base/x509_util_mac.cc', - 'base/x509_util_mac.h', - 'base/x509_util_nss.cc', - 'base/x509_util_nss.h', - 'base/x509_util_openssl.cc', - 'base/x509_util_openssl.h', 'base/zap.cc', 'base/zap.h', + 'cert/asn1_util.cc', + 'cert/asn1_util.h', + 'cert/cert_database.cc', + 'cert/cert_database.h', + 'cert/cert_database_android.cc', + 'cert/cert_database_ios.cc', + 'cert/cert_database_mac.cc', + 'cert/cert_database_nss.cc', + 'cert/cert_database_openssl.cc', + 'cert/cert_database_win.cc', + 'cert/cert_status_flags.cc', + 'cert/cert_status_flags.h', + 'cert/cert_trust_anchor_provider.h', + 'cert/cert_verifier.cc', + 'cert/cert_verifier.h', + 'cert/cert_verify_proc.cc', + 'cert/cert_verify_proc.h', + 'cert/cert_verify_proc_android.cc', + 'cert/cert_verify_proc_android.h', + 'cert/cert_verify_proc_mac.cc', + 'cert/cert_verify_proc_mac.h', + 'cert/cert_verify_proc_nss.cc', + 'cert/cert_verify_proc_nss.h', + 'cert/cert_verify_proc_openssl.cc', + 'cert/cert_verify_proc_openssl.h', + 'cert/cert_verify_proc_win.cc', + 'cert/cert_verify_proc_win.h', + 'cert/cert_verify_result.cc', + 'cert/cert_verify_result.h', + 'cert/crl_set.cc', + 'cert/crl_set.h', + 'cert/ev_root_ca_metadata.cc', + 'cert/ev_root_ca_metadata.h', + 'cert/multi_threaded_cert_verifier.cc', + 'cert/multi_threaded_cert_verifier.h', + 'cert/nss_cert_database.cc', + 'cert/nss_cert_database.h', + 'cert/pem_tokenizer.cc', + 'cert/pem_tokenizer.h', + 'cert/single_request_cert_verifier.cc', + 'cert/single_request_cert_verifier.h', + 'cert/test_root_certs.cc', + 'cert/test_root_certs.h', + 'cert/test_root_certs_mac.cc', + 'cert/test_root_certs_nss.cc', + 'cert/test_root_certs_openssl.cc', + 'cert/test_root_certs_android.cc', + 'cert/test_root_certs_win.cc', + 'cert/x509_cert_types.cc', + 'cert/x509_cert_types.h', + 'cert/x509_cert_types_mac.cc', + 'cert/x509_cert_types_win.cc', + 'cert/x509_certificate.cc', + 'cert/x509_certificate.h', + 'cert/x509_certificate_ios.cc', + 'cert/x509_certificate_mac.cc', + 'cert/x509_certificate_net_log_param.cc', + 'cert/x509_certificate_net_log_param.h', + 'cert/x509_certificate_nss.cc', + 'cert/x509_certificate_openssl.cc', + 'cert/x509_certificate_win.cc', + 'cert/x509_util.h', + 'cert/x509_util.cc', + 'cert/x509_util_ios.cc', + 'cert/x509_util_ios.h', + 'cert/x509_util_mac.cc', + 'cert/x509_util_mac.h', + 'cert/x509_util_nss.cc', + 'cert/x509_util_nss.h', + 'cert/x509_util_openssl.cc', + 'cert/x509_util_openssl.h', 'cookies/canonical_cookie.cc', 'cookies/canonical_cookie.h', 'cookies/cookie_monster.cc', @@ -1089,19 +1089,19 @@ }], ['use_openssl==1', { 'sources!': [ - 'base/cert_database_nss.cc', - 'base/cert_verify_proc_nss.cc', - 'base/cert_verify_proc_nss.h', 'base/crypto_module_nss.cc', 'base/keygen_handler_nss.cc', - 'base/nss_cert_database.cc', - 'base/nss_cert_database.h', 'base/nss_memio.c', 'base/nss_memio.h', - 'base/test_root_certs_nss.cc', - 'base/x509_certificate_nss.cc', - 'base/x509_util_nss.cc', - 'base/x509_util_nss.h', + 'cert/cert_database_nss.cc', + 'cert/cert_verify_proc_nss.cc', + 'cert/cert_verify_proc_nss.h', + 'cert/nss_cert_database.cc', + 'cert/nss_cert_database.h', + 'cert/test_root_certs_nss.cc', + 'cert/x509_certificate_nss.cc', + 'cert/x509_util_nss.cc', + 'cert/x509_util_nss.h', 'ocsp/nss_ocsp.cc', 'ocsp/nss_ocsp.h', 'quic/crypto/aes_128_gcm_decrypter_nss.cc', @@ -1124,9 +1124,6 @@ }, { # else !use_openssl: remove the unneeded files 'sources!': [ - 'base/cert_database_openssl.cc', - 'base/cert_verify_proc_openssl.cc', - 'base/cert_verify_proc_openssl.h', 'base/crypto_module_openssl.cc', 'base/keygen_handler_openssl.cc', 'base/openssl_client_key_store.cc', @@ -1134,10 +1131,13 @@ 'base/openssl_private_key_store.h', 'base/openssl_private_key_store_android.cc', 'base/openssl_private_key_store_memory.cc', - 'base/test_root_certs_openssl.cc', - 'base/x509_certificate_openssl.cc', - 'base/x509_util_openssl.cc', - 'base/x509_util_openssl.h', + 'cert/cert_database_openssl.cc', + 'cert/cert_verify_proc_openssl.cc', + 'cert/cert_verify_proc_openssl.h', + 'cert/test_root_certs_openssl.cc', + 'cert/x509_certificate_openssl.cc', + 'cert/x509_util_openssl.cc', + 'cert/x509_util_openssl.h', 'quic/crypto/aes_128_gcm_decrypter_openssl.cc', 'quic/crypto/aes_128_gcm_encrypter_openssl.cc', 'quic/crypto/p256_key_exchange_openssl.cc', @@ -1186,13 +1186,13 @@ }, { # else: OS is not in the above list 'sources!': [ - 'base/cert_database_nss.cc', 'base/crypto_module_nss.cc', 'base/keygen_handler_nss.cc', - 'base/nss_cert_database.cc', - 'base/nss_cert_database.h', - 'base/test_root_certs_nss.cc', - 'base/x509_certificate_nss.cc', + 'cert/cert_database_nss.cc', + 'cert/nss_cert_database.cc', + 'cert/nss_cert_database.h', + 'cert/test_root_certs_nss.cc', + 'cert/x509_certificate_nss.cc', 'ocsp/nss_ocsp.cc', 'ocsp/nss_ocsp.h', 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', @@ -1211,8 +1211,8 @@ }], [ 'use_nss != 1', { 'sources!': [ - 'base/cert_verify_proc_nss.cc', - 'base/cert_verify_proc_nss.h', + 'cert/cert_verify_proc_nss.cc', + 'cert/cert_verify_proc_nss.h', 'ssl/client_cert_store_impl_nss.cc', ], }], @@ -1302,10 +1302,10 @@ 'net_jni_headers', ], 'sources!': [ - 'base/cert_database_openssl.cc', - 'base/cert_verify_proc_openssl.cc', 'base/openssl_private_key_store_memory.cc', - 'base/test_root_certs_openssl.cc', + 'cert/cert_database_openssl.cc', + 'cert/cert_verify_proc_openssl.cc', + 'cert/test_root_certs_openssl.cc', ], # The net/android/keystore_openssl.cc source file needs to # access an OpenSSL-internal header. @@ -1342,17 +1342,17 @@ ['include', '^base/network_change_notifier_mac\\.cc$'], ['include', '^base/network_config_watcher_mac\\.cc$'], ['include', '^base/platform_mime_util_mac\\.mm$'], - ['include', '^dns/notify_watcher_mac\\.cc$'], - ['include', '^proxy/proxy_resolver_mac\\.cc$'], - ['include', '^proxy/proxy_server_mac\\.cc$'], # The iOS implementation only partially uses NSS and thus does not # defines |use_nss|. In particular the |USE_NSS| preprocessor # definition is not used. The following files are needed though: - ['include', '^base/cert_verify_proc_nss\\.cc$'], - ['include', '^base/cert_verify_proc_nss\\.h$'], - ['include', '^base/test_root_certs_nss\\.cc$'], - ['include', '^base/x509_util_nss\\.cc$'], - ['include', '^base/x509_util_nss\\.h$'], + ['include', '^cert/cert_verify_proc_nss\\.cc$'], + ['include', '^cert/cert_verify_proc_nss\\.h$'], + ['include', '^cert/test_root_certs_nss\\.cc$'], + ['include', '^cert/x509_util_nss\\.cc$'], + ['include', '^cert/x509_util_nss\\.h$'], + ['include', '^dns/notify_watcher_mac\\.cc$'], + ['include', '^proxy/proxy_resolver_mac\\.cc$'], + ['include', '^proxy/proxy_server_mac\\.cc$'], ['include', '^ocsp/nss_ocsp\\.cc$'], ['include', '^ocsp/nss_ocsp\\.h$'], ], @@ -1381,13 +1381,10 @@ 'base/address_tracker_linux_unittest.cc', 'base/backoff_entry_unittest.cc', 'base/big_endian_unittest.cc', - 'base/cert_verify_proc_unittest.cc', - 'base/crl_set_unittest.cc', 'base/data_url_unittest.cc', 'base/directory_lister_unittest.cc', 'base/dns_util_unittest.cc', 'base/escape_unittest.cc', - 'base/ev_root_ca_metadata_unittest.cc', 'base/expiring_cache_unittest.cc', 'base/file_stream_unittest.cc', 'base/filter_unittest.cc', @@ -1402,13 +1399,10 @@ 'base/mime_util_unittest.cc', 'base/mock_filter_context.cc', 'base/mock_filter_context.h', - 'base/multi_threaded_cert_verifier_unittest.cc', 'base/net_log_unittest.h', 'base/net_util_unittest.cc', 'base/network_change_notifier_win_unittest.cc', - 'base/nss_cert_database_unittest.cc', 'base/openssl_client_key_store_unittest.cc', - 'base/pem_tokenizer_unittest.cc', 'base/prioritized_dispatcher_unittest.cc', 'base/priority_queue_unittest.cc', 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc', @@ -1416,18 +1410,23 @@ 'base/static_cookie_policy_unittest.cc', 'base/tcp_listen_socket_unittest.cc', 'base/tcp_listen_socket_unittest.h', - 'base/test_certificate_data.h', 'base/test_completion_callback_unittest.cc', 'base/unix_domain_socket_posix_unittest.cc', 'base/upload_bytes_element_reader_unittest.cc', 'base/upload_data_stream_unittest.cc', 'base/upload_file_element_reader_unittest.cc', 'base/url_util_unittest.cc', - 'base/x509_certificate_unittest.cc', - 'base/x509_cert_types_unittest.cc', - 'base/x509_util_unittest.cc', - 'base/x509_util_nss_unittest.cc', - 'base/x509_util_openssl_unittest.cc', + 'cert/cert_verify_proc_unittest.cc', + 'cert/crl_set_unittest.cc', + 'cert/ev_root_ca_metadata_unittest.cc', + 'cert/multi_threaded_cert_verifier_unittest.cc', + 'cert/nss_cert_database_unittest.cc', + 'cert/pem_tokenizer_unittest.cc', + 'cert/x509_certificate_unittest.cc', + 'cert/x509_cert_types_unittest.cc', + 'cert/x509_util_unittest.cc', + 'cert/x509_util_nss_unittest.cc', + 'cert/x509_util_openssl_unittest.cc', 'cookies/canonical_cookie_unittest.cc', 'cookies/cookie_monster_unittest.cc', 'cookies/cookie_store_unittest.h', @@ -1670,6 +1669,7 @@ 'ssl/ssl_config_service_unittest.cc', 'test/python_utils_unittest.cc', 'test/run_all_unittests.cc', + 'test/test_certificate_data.h', 'tools/dump_cache/url_to_filename_encoder.cc', 'tools/dump_cache/url_to_filename_encoder.h', 'tools/dump_cache/url_to_filename_encoder_unittest.cc', @@ -1726,7 +1726,7 @@ ], }, { # else use_glib == 0: !posix || mac 'sources!': [ - 'base/nss_cert_database_unittest.cc', + 'cert/nss_cert_database_unittest.cc', ], }, ], @@ -1762,14 +1762,14 @@ # TODO(bulach): Add equivalent tests when the underlying # functionality is ported to OpenSSL. 'sources!': [ - 'base/nss_cert_database_unittest.cc', - 'base/x509_util_nss_unittest.cc', + 'cert/nss_cert_database_unittest.cc', + 'cert/x509_util_nss_unittest.cc', 'ssl/client_cert_store_impl_unittest.cc', ], }, { # else !use_openssl: remove the unneeded files 'sources!': [ 'base/openssl_client_key_store_unittest.cc', - 'base/x509_util_openssl_unittest.cc', + 'cert/x509_util_openssl_unittest.cc', 'socket/ssl_client_socket_openssl_unittest.cc', ], }, @@ -1925,7 +1925,7 @@ }], [ 'OS != "win" and OS != "mac"', { 'sources!': [ - 'base/x509_cert_types_unittest.cc', + 'cert/x509_cert_types_unittest.cc', ], }], ], @@ -1988,18 +1988,16 @@ 'sources': [ 'base/capturing_net_log.cc', 'base/capturing_net_log.h', - 'base/cert_test_util.cc', - 'base/cert_test_util.h', 'base/load_timing_info_test_util.cc', 'base/load_timing_info_test_util.h', - 'base/mock_cert_verifier.cc', - 'base/mock_cert_verifier.h', 'base/mock_file_stream.cc', 'base/mock_file_stream.h', 'base/test_completion_callback.cc', 'base/test_completion_callback.h', 'base/test_data_directory.cc', 'base/test_data_directory.h', + 'cert/mock_cert_verifier.cc', + 'cert/mock_cert_verifier.h', 'cookies/cookie_monster_store_test.cc', 'cookies/cookie_monster_store_test.h', 'cookies/cookie_store_test_callbacks.cc', @@ -2026,6 +2024,8 @@ 'socket/socket_test_util.h', 'test/base_test_server.cc', 'test/base_test_server.h', + 'test/cert_test_util.cc', + 'test/cert_test_util.h', 'test/local_test_server_posix.cc', 'test/local_test_server_win.cc', 'test/local_test_server.cc', diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc index a61a649..6309941 100644 --- a/net/proxy/proxy_script_fetcher_impl.cc +++ b/net/proxy/proxy_script_fetcher_impl.cc @@ -9,11 +9,11 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "net/base/cert_status_flags.h" #include "net/base/data_url.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" +#include "net/cert/cert_status_flags.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_context.h" diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index 0c414de..87afb27 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -11,9 +11,9 @@ #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "net/base/load_flags.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" +#include "net/cert/mock_cert_verifier.h" #include "net/disk_cache/disk_cache.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_cache.h" diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc index fecd7d9..e18f357 100644 --- a/net/quic/quic_network_transaction_unittest.cc +++ b/net/quic/quic_network_transaction_unittest.cc @@ -5,8 +5,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/test_completion_callback.h" +#include "net/cert/mock_cert_verifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc index a058f49..f97500a 100644 --- a/net/socket/client_socket_factory.cc +++ b/net/socket/client_socket_factory.cc @@ -8,7 +8,7 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" #include "build/build_config.h" -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" #include "net/socket/client_socket_handle.h" #if defined(USE_OPENSSL) #include "net/socket/ssl_client_socket_openssl.h" diff --git a/net/socket/client_socket_pool_manager_impl.h b/net/socket/client_socket_pool_manager_impl.h index ff5e5a2..8f6e618 100644 --- a/net/socket/client_socket_pool_manager_impl.h +++ b/net/socket/client_socket_pool_manager_impl.h @@ -13,7 +13,7 @@ #include "base/stl_util.h" #include "base/template_util.h" #include "base/threading/non_thread_safe.h" -#include "net/base/cert_database.h" +#include "net/cert/cert_database.h" #include "net/http/http_network_session.h" #include "net/socket/client_socket_pool_histograms.h" #include "net/socket/client_socket_pool_manager.h" diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index c762e93..24fa8d3 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -85,17 +85,17 @@ #include "crypto/rsa_private_key.h" #include "crypto/scoped_nss_types.h" #include "net/base/address_list.h" -#include "net/base/asn1_util.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_verifier.h" #include "net/base/connection_type_histograms.h" #include "net/base/dns_util.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/single_request_cert_verifier.h" -#include "net/base/x509_certificate_net_log_param.h" -#include "net/base/x509_util.h" +#include "net/cert/asn1_util.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/single_request_cert_verifier.h" +#include "net/cert/x509_certificate_net_log_param.h" +#include "net/cert/x509_util.h" #include "net/http/transport_security_state.h" #include "net/ocsp/nss_ocsp.h" #include "net/socket/client_socket_handle.h" diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h index 0ce7338..3c9434b 100644 --- a/net/socket/ssl_client_socket_nss.h +++ b/net/socket/ssl_client_socket_nss.h @@ -18,13 +18,13 @@ #include "base/threading/platform_thread.h" #include "base/time.h" #include "base/timer.h" -#include "net/base/cert_verify_result.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" #include "net/base/net_export.h" #include "net/base/net_log.h" #include "net/base/nss_memio.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_verify_result.h" +#include "net/cert/x509_certificate.h" #include "net/socket/ssl_client_socket.h" #include "net/ssl/server_bound_cert_service.h" #include "net/ssl/ssl_config_service.h" diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 87a0c50..482c500 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -17,11 +17,11 @@ #include "base/metrics/histogram.h" #include "base/synchronization/lock.h" #include "crypto/openssl_util.h" -#include "net/base/cert_verifier.h" #include "net/base/net_errors.h" #include "net/base/openssl_client_key_store.h" -#include "net/base/single_request_cert_verifier.h" -#include "net/base/x509_certificate_net_log_param.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/single_request_cert_verifier.h" +#include "net/cert/x509_certificate_net_log_param.h" #include "net/socket/ssl_error_params.h" #include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_connection_status_flags.h" diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h index f54b265..e17aca7 100644 --- a/net/socket/ssl_client_socket_openssl.h +++ b/net/socket/ssl_client_socket_openssl.h @@ -9,9 +9,9 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "net/base/cert_verify_result.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" +#include "net/cert/cert_verify_result.h" #include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" #include "net/ssl/ssl_config_service.h" diff --git a/net/socket/ssl_client_socket_openssl_unittest.cc b/net/socket/ssl_client_socket_openssl_unittest.cc index 5b0bb2a..d73fae8 100644 --- a/net/socket/ssl_client_socket_openssl_unittest.cc +++ b/net/socket/ssl_client_socket_openssl_unittest.cc @@ -20,16 +20,15 @@ #include "base/values.h" #include "crypto/openssl_util.h" #include "net/base/address_list.h" -#include "net/base/cert_test_util.h" #include "net/base/io_buffer.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/openssl_client_key_store.h" #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" -#include "net/base/test_root_certs.h" +#include "net/cert/mock_cert_verifier.h" +#include "net/cert/test_root_certs.h" #include "net/dns/host_resolver.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_handle.h" @@ -37,6 +36,7 @@ #include "net/socket/tcp_client_socket.h" #include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_config_service.h" +#include "net/test/cert_test_util.h" #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index 085c341..c188a80 100644 --- a/net/socket/ssl_client_socket_pool_unittest.cc +++ b/net/socket/ssl_client_socket_pool_unittest.cc @@ -10,12 +10,11 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "net/base/auth.h" -#include "net/base/cert_verifier.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/net_errors.h" -#include "net/base/test_certificate_data.h" #include "net/base/test_completion_callback.h" +#include "net/cert/cert_verifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" @@ -30,6 +29,7 @@ #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_test_util_spdy2.h" #include "net/ssl/ssl_config_service_defaults.h" +#include "net/test/test_certificate_data.h" #include "testing/gtest/include/gtest/gtest.h" using namespace net::test_spdy2; diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 6507f0d..aa1252c 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -7,15 +7,14 @@ #include "base/callback_helpers.h" #include "base/memory/ref_counted.h" #include "net/base/address_list.h" -#include "net/base/cert_test_util.h" #include "net/base/io_buffer.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" -#include "net/base/test_root_certs.h" +#include "net/cert/mock_cert_verifier.h" +#include "net/cert/test_root_certs.h" #include "net/dns/host_resolver.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_handle.h" @@ -23,6 +22,7 @@ #include "net/socket/tcp_client_socket.h" #include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_config_service.h" +#include "net/test/cert_test_util.h" #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index 817b912..9f43910 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -27,23 +27,23 @@ #include "crypto/nss_util.h" #include "crypto/rsa_private_key.h" #include "net/base/address_list.h" -#include "net/base/cert_status_flags.h" -#include "net/base/cert_test_util.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" -#include "net/base/mock_cert_verifier.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/test_data_directory.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/mock_cert_verifier.h" +#include "net/cert/x509_certificate.h" #include "net/socket/client_socket_factory.h" #include "net/socket/socket_test_util.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/stream_socket.h" #include "net/ssl/ssl_config_service.h" #include "net/ssl/ssl_info.h" +#include "net/test/cert_test_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/spdy/spdy_credential_builder.cc b/net/spdy/spdy_credential_builder.cc index 88080d9..c0fb40d 100644 --- a/net/spdy/spdy_credential_builder.cc +++ b/net/spdy/spdy_credential_builder.cc @@ -8,8 +8,8 @@ #include "base/string_piece.h" #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" -#include "net/base/asn1_util.h" #include "net/base/net_errors.h" +#include "net/cert/asn1_util.h" #include "net/socket/ssl_client_socket.h" #include "net/spdy/spdy_framer.h" #include "net/ssl/server_bound_cert_service.h" diff --git a/net/spdy/spdy_credential_builder_unittest.cc b/net/spdy/spdy_credential_builder_unittest.cc index 1d83a63..1332948 100644 --- a/net/spdy/spdy_credential_builder_unittest.cc +++ b/net/spdy/spdy_credential_builder_unittest.cc @@ -7,7 +7,7 @@ #include "base/threading/sequenced_worker_pool.h" #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" -#include "net/base/asn1_util.h" +#include "net/cert/asn1_util.h" #include "net/spdy/spdy_test_util_spdy3.h" #include "net/ssl/default_server_bound_cert_store.h" #include "net/ssl/server_bound_cert_service.h" diff --git a/net/spdy/spdy_http_stream_spdy2_unittest.cc b/net/spdy/spdy_http_stream_spdy2_unittest.cc index 4e35f46..7174fcd 100644 --- a/net/spdy/spdy_http_stream_spdy2_unittest.cc +++ b/net/spdy/spdy_http_stream_spdy2_unittest.cc @@ -7,12 +7,12 @@ #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" #include "crypto/signature_creator.h" -#include "net/base/asn1_util.h" #include "net/base/capturing_net_log.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_element_reader.h" +#include "net/cert/asn1_util.h" #include "net/http/http_request_info.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" diff --git a/net/spdy/spdy_http_stream_spdy3_unittest.cc b/net/spdy/spdy_http_stream_spdy3_unittest.cc index 92496ea..8162e4e 100644 --- a/net/spdy/spdy_http_stream_spdy3_unittest.cc +++ b/net/spdy/spdy_http_stream_spdy3_unittest.cc @@ -9,12 +9,12 @@ #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" #include "crypto/signature_creator.h" -#include "net/base/asn1_util.h" #include "net/base/capturing_net_log.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_element_reader.h" +#include "net/cert/asn1_util.h" #include "net/http/http_request_info.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 21fcd13..e528296 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -24,10 +24,10 @@ #include "base/values.h" #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" -#include "net/base/asn1_util.h" #include "net/base/connection_type_histograms.h" #include "net/base/net_log.h" #include "net/base/net_util.h" +#include "net/cert/asn1_util.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties.h" #include "net/spdy/spdy_credential_builder.h" diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h index f10cc0f..19d0a30 100644 --- a/net/spdy/spdy_session_pool.h +++ b/net/spdy/spdy_session_pool.h @@ -12,12 +12,12 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "net/base/cert_database.h" #include "net/base/host_port_pair.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" #include "net/base/net_export.h" #include "net/base/network_change_notifier.h" +#include "net/cert/cert_database.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_server.h" #include "net/socket/next_proto.h" diff --git a/net/spdy/spdy_session_spdy2_unittest.cc b/net/spdy/spdy_session_spdy2_unittest.cc index 2a2ff72..c1276f4 100644 --- a/net/spdy/spdy_session_spdy2_unittest.cc +++ b/net/spdy/spdy_session_spdy2_unittest.cc @@ -6,7 +6,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "net/base/cert_test_util.h" #include "net/base/host_cache.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" @@ -21,6 +20,7 @@ #include "net/spdy/spdy_stream_test_util.h" #include "net/spdy/spdy_test_util_common.h" #include "net/spdy/spdy_test_util_spdy2.h" +#include "net/test/cert_test_util.h" #include "testing/platform_test.h" using namespace net::test_spdy2; diff --git a/net/spdy/spdy_session_spdy3_unittest.cc b/net/spdy/spdy_session_spdy3_unittest.cc index ff62bf6..f17d0ff 100644 --- a/net/spdy/spdy_session_spdy3_unittest.cc +++ b/net/spdy/spdy_session_spdy3_unittest.cc @@ -10,7 +10,6 @@ #include "base/pending_task.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "net/base/cert_test_util.h" #include "net/base/host_cache.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" @@ -26,6 +25,7 @@ #include "net/spdy/spdy_stream_test_util.h" #include "net/spdy/spdy_test_util_common.h" #include "net/spdy/spdy_test_util_spdy3.h" +#include "net/test/cert_test_util.h" #include "testing/platform_test.h" using namespace net::test_spdy3; diff --git a/net/spdy/spdy_test_util_spdy2.cc b/net/spdy/spdy_test_util_spdy2.cc index 49d99e7..703371c 100644 --- a/net/spdy/spdy_test_util_spdy2.cc +++ b/net/spdy/spdy_test_util_spdy2.cc @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "net/base/mock_cert_verifier.h" +#include "net/cert/mock_cert_verifier.h" #include "net/http/http_network_session.h" #include "net/http/http_network_transaction.h" #include "net/http/http_server_properties_impl.h" diff --git a/net/spdy/spdy_test_util_spdy2.h b/net/spdy/spdy_test_util_spdy2.h index 6054c38..4023689 100644 --- a/net/spdy/spdy_test_util_spdy2.h +++ b/net/spdy/spdy_test_util_spdy2.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" -#include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" #include "net/base/request_priority.h" +#include "net/cert/cert_verifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/net/spdy/spdy_test_util_spdy3.cc b/net/spdy/spdy_test_util_spdy3.cc index 6516ee8..37827a9 100644 --- a/net/spdy/spdy_test_util_spdy3.cc +++ b/net/spdy/spdy_test_util_spdy3.cc @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "net/base/mock_cert_verifier.h" +#include "net/cert/mock_cert_verifier.h" #include "net/http/http_network_session.h" #include "net/http/http_network_transaction.h" #include "net/http/http_server_properties_impl.h" diff --git a/net/spdy/spdy_test_util_spdy3.h b/net/spdy/spdy_test_util_spdy3.h index 27c8670..0a8b24c 100644 --- a/net/spdy/spdy_test_util_spdy3.h +++ b/net/spdy/spdy_test_util_spdy3.h @@ -10,9 +10,9 @@ #include "base/string_piece.h" #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" -#include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" #include "net/base/request_priority.h" +#include "net/cert/cert_verifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/net/ssl/client_cert_store.h b/net/ssl/client_cert_store.h index 77ebe37..46ef336 100644 --- a/net/ssl/client_cert_store.h +++ b/net/ssl/client_cert_store.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "net/base/net_export.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/ssl/client_cert_store_impl_mac.cc b/net/ssl/client_cert_store_impl_mac.cc index 0a1bd01..ed10a7f 100644 --- a/net/ssl/client_cert_store_impl_mac.cc +++ b/net/ssl/client_cert_store_impl_mac.cc @@ -20,7 +20,7 @@ #include "base/synchronization/lock.h" #include "crypto/mac_security_services_lock.h" #include "net/base/host_port_pair.h" -#include "net/base/x509_util.h" +#include "net/cert/x509_util.h" using base::mac::ScopedCFTypeRef; diff --git a/net/ssl/client_cert_store_impl_nss.cc b/net/ssl/client_cert_store_impl_nss.cc index bca8ea5..255f770 100644 --- a/net/ssl/client_cert_store_impl_nss.cc +++ b/net/ssl/client_cert_store_impl_nss.cc @@ -8,7 +8,7 @@ #include <ssl.h> #include "base/logging.h" -#include "net/base/x509_util.h" +#include "net/cert/x509_util.h" namespace net { diff --git a/net/ssl/client_cert_store_impl_unittest.cc b/net/ssl/client_cert_store_impl_unittest.cc index 63ea02d..1c4512d 100644 --- a/net/ssl/client_cert_store_impl_unittest.cc +++ b/net/ssl/client_cert_store_impl_unittest.cc @@ -10,8 +10,8 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "net/base/cert_test_util.h" #include "net/base/test_data_directory.h" +#include "net/test/cert_test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/ssl/client_cert_store_impl_win.cc b/net/ssl/client_cert_store_impl_win.cc index 7dbe1f0..d6df838 100644 --- a/net/ssl/client_cert_store_impl_win.cc +++ b/net/ssl/client_cert_store_impl_win.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "crypto/scoped_capi_types.h" -#include "net/base/x509_util.h" +#include "net/cert/x509_util.h" namespace net { diff --git a/net/ssl/server_bound_cert_service.cc b/net/ssl/server_bound_cert_service.cc index ece1a2c..bf77719 100644 --- a/net/ssl/server_bound_cert_service.cc +++ b/net/ssl/server_bound_cert_service.cc @@ -24,8 +24,8 @@ #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "net/base/x509_certificate.h" -#include "net/base/x509_util.h" +#include "net/cert/x509_certificate.h" +#include "net/cert/x509_util.h" #if defined(USE_NSS) #include <private/pprthred.h> // PR_DetachThread diff --git a/net/ssl/server_bound_cert_service_unittest.cc b/net/ssl/server_bound_cert_service_unittest.cc index 4d0c6f4..928efc8 100644 --- a/net/ssl/server_bound_cert_service_unittest.cc +++ b/net/ssl/server_bound_cert_service_unittest.cc @@ -12,10 +12,10 @@ #include "base/message_loop.h" #include "base/threading/sequenced_worker_pool.h" #include "crypto/ec_private_key.h" -#include "net/base/asn1_util.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" -#include "net/base/x509_certificate.h" +#include "net/cert/asn1_util.h" +#include "net/cert/x509_certificate.h" #include "net/ssl/default_server_bound_cert_store.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/ssl/ssl_cert_request_info.cc b/net/ssl/ssl_cert_request_info.cc index 98d1f76..10750b6 100644 --- a/net/ssl/ssl_cert_request_info.cc +++ b/net/ssl/ssl_cert_request_info.cc @@ -4,7 +4,7 @@ #include "net/ssl/ssl_cert_request_info.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/ssl/ssl_client_auth_cache.cc b/net/ssl/ssl_client_auth_cache.cc index 9fb9e4f..0c0704e 100644 --- a/net/ssl/ssl_client_auth_cache.cc +++ b/net/ssl/ssl_client_auth_cache.cc @@ -5,7 +5,7 @@ #include "net/ssl/ssl_client_auth_cache.h" #include "base/logging.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/ssl/ssl_client_auth_cache.h b/net/ssl/ssl_client_auth_cache.h index 742d0f3..250841b 100644 --- a/net/ssl/ssl_client_auth_cache.h +++ b/net/ssl/ssl_client_auth_cache.h @@ -10,8 +10,8 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "net/base/cert_database.h" #include "net/base/net_export.h" +#include "net/cert/cert_database.h" namespace net { diff --git a/net/ssl/ssl_client_auth_cache_unittest.cc b/net/ssl/ssl_client_auth_cache_unittest.cc index 9a5c5c0..ef507e4 100644 --- a/net/ssl/ssl_client_auth_cache_unittest.cc +++ b/net/ssl/ssl_client_auth_cache_unittest.cc @@ -5,7 +5,7 @@ #include "net/ssl/ssl_client_auth_cache.h" #include "base/time.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/ssl/ssl_config_service.cc b/net/ssl/ssl_config_service.cc index 829e101..f46dd7b 100644 --- a/net/ssl/ssl_config_service.cc +++ b/net/ssl/ssl_config_service.cc @@ -7,7 +7,7 @@ #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" -#include "net/base/crl_set.h" +#include "net/cert/crl_set.h" #include "net/ssl/ssl_config_service_defaults.h" #if defined(USE_OPENSSL) diff --git a/net/ssl/ssl_config_service.h b/net/ssl/ssl_config_service.h index 5206584..01c20cd 100644 --- a/net/ssl/ssl_config_service.h +++ b/net/ssl/ssl_config_service.h @@ -11,10 +11,10 @@ #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/string_piece.h" -#include "net/base/cert_status_flags.h" -#include "net/base/crl_set.h" #include "net/base/net_export.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/crl_set.h" +#include "net/cert/x509_certificate.h" namespace net { diff --git a/net/ssl/ssl_info.cc b/net/ssl/ssl_info.cc index b147966..6c3485b 100644 --- a/net/ssl/ssl_info.cc +++ b/net/ssl/ssl_info.cc @@ -4,8 +4,8 @@ #include "net/ssl/ssl_info.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" namespace net { diff --git a/net/ssl/ssl_info.h b/net/ssl/ssl_info.h index 32ac069..d8333a3 100644 --- a/net/ssl/ssl_info.h +++ b/net/ssl/ssl_info.h @@ -8,9 +8,9 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "net/base/cert_status_flags.h" #include "net/base/net_export.h" -#include "net/base/x509_cert_types.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/x509_cert_types.h" namespace net { diff --git a/net/test/base_test_server.cc b/net/test/base_test_server.cc index 9500088e..3a2dc11 100644 --- a/net/test/base_test_server.cc +++ b/net/test/base_test_server.cc @@ -20,7 +20,7 @@ #include "net/base/net_log.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" -#include "net/base/test_root_certs.h" +#include "net/cert/test_root_certs.h" #include "net/dns/host_resolver.h" namespace net { diff --git a/net/base/cert_test_util.cc b/net/test/cert_test_util.cc index 11b9a71..085a459 100644 --- a/net/base/cert_test_util.cc +++ b/net/test/cert_test_util.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/cert_test_util.h" +#include "net/test/cert_test_util.h" #include "base/file_util.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "net/base/ev_root_ca_metadata.h" -#include "net/base/x509_certificate.h" +#include "net/cert/ev_root_ca_metadata.h" +#include "net/cert/x509_certificate.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/cert_test_util.h b/net/test/cert_test_util.h index db49e87..d4aa4d7 100644 --- a/net/base/cert_test_util.h +++ b/net/test/cert_test_util.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_CERT_TEST_UTIL_H_ -#define NET_BASE_CERT_TEST_UTIL_H_ +#ifndef NET_TEST_CERT_TEST_UTIL_H_ +#define NET_TEST_CERT_TEST_UTIL_H_ #include <string> #include "base/memory/ref_counted.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" namespace base { class FilePath; @@ -50,4 +50,4 @@ class ScopedTestEVPolicy { } // namespace net -#endif // NET_BASE_CERT_TEST_UTIL_H_ +#endif // NET_TEST_CERT_TEST_UTIL_H_ diff --git a/net/base/test_certificate_data.h b/net/test/test_certificate_data.h index edbbc36..edbbc36 100644 --- a/net/base/test_certificate_data.h +++ b/net/test/test_certificate_data.h diff --git a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp index 89d0191..baa4966 100644 --- a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp +++ b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp @@ -47,7 +47,7 @@ #include "crypto/nss_util_internal.h" #include "crypto/scoped_nss_types.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #if !defined(CERTDB_TERMINAL_RECORD) /* NSS 3.13 renames CERTDB_VALID_PEER to CERTDB_TERMINAL_RECORD diff --git a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h index 0e5b33b..aac9912 100644 --- a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h +++ b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h @@ -42,7 +42,7 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "net/base/nss_cert_database.h" +#include "net/cert/nss_cert_database.h" typedef struct CERTCertificateStr CERTCertificate; namespace net { diff --git a/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp b/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp index cf15d72..0c0f731 100644 --- a/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp +++ b/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp @@ -47,7 +47,7 @@ #include "base/string_util.h" #include "crypto/nss_util_internal.h" #include "net/base/net_errors.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace mozilla_security_manager { diff --git a/net/tools/crl_set_dump/crl_set_dump.cc b/net/tools/crl_set_dump/crl_set_dump.cc index c13940c..6034bd0 100644 --- a/net/tools/crl_set_dump/crl_set_dump.cc +++ b/net/tools/crl_set_dump/crl_set_dump.cc @@ -15,7 +15,7 @@ #include "base/file_util.h" #include "base/memory/ref_counted.h" #include "base/string_number_conversions.h" -#include "net/base/crl_set.h" +#include "net/cert/crl_set.h" static int Usage(const char* argv0) { fprintf(stderr, "Usage: %s <crl-set file> [<delta file>]" diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc index ef86826..4191128 100644 --- a/net/tools/fetch/fetch_client.cc +++ b/net/tools/fetch/fetch_client.cc @@ -13,11 +13,11 @@ #include "base/metrics/stats_counters.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "net/base/cert_verifier.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/request_priority.h" +#include "net/cert/cert_verifier.h" #include "net/dns/host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index 8cd34de..6a14bc2 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc @@ -12,9 +12,9 @@ #include "base/string_util.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" -#include "net/base/cert_verifier.h" #include "net/base/net_errors.h" #include "net/base/network_delegate.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" diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc index ae4140f..30fefd5 100644 --- a/net/url_request/url_request_context_storage.cc +++ b/net/url_request/url_request_context_storage.cc @@ -5,9 +5,9 @@ #include "net/url_request/url_request_context_storage.h" #include "base/logging.h" -#include "net/base/cert_verifier.h" #include "net/base/net_log.h" #include "net/base/network_delegate.h" +#include "net/cert/cert_verifier.h" #include "net/cookies/cookie_store.h" #include "net/dns/host_resolver.h" #include "net/ftp/ftp_transaction_factory.h" diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index e2cd99d..988ecdb 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -17,7 +17,6 @@ #include "base/rand_util.h" #include "base/string_util.h" #include "base/time.h" -#include "net/base/cert_status_flags.h" #include "net/base/filter.h" #include "net/base/host_port_pair.h" #include "net/base/load_flags.h" @@ -26,6 +25,7 @@ #include "net/base/net_util.h" #include "net/base/network_delegate.h" #include "net/base/sdch_manager.h" +#include "net/cert/cert_status_flags.h" #include "net/cookies/cookie_monster.h" #include "net/http/http_network_session.h" #include "net/http/http_request_headers.h" diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc index abb54c2..c179927 100644 --- a/net/url_request/url_request_test_util.cc +++ b/net/url_request/url_request_test_util.cc @@ -9,8 +9,8 @@ #include "base/message_loop.h" #include "base/threading/thread.h" #include "base/threading/worker_pool.h" -#include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" +#include "net/cert/cert_verifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h index 016477e..477a714 100644 --- a/net/url_request/url_request_test_util.h +++ b/net/url_request/url_request_test_util.h @@ -21,11 +21,11 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "googleurl/src/url_util.h" -#include "net/base/cert_verifier.h" #include "net/base/io_buffer.h" #include "net/base/load_timing_info.h" #include "net/base/net_errors.h" #include "net/base/network_delegate.h" +#include "net/cert/cert_verifier.h" #include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" #include "net/ftp/ftp_network_layer.h" diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 4ad76b5..d0efc69 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -28,8 +28,6 @@ #include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "net/base/capturing_net_log.h" -#include "net/base/cert_test_util.h" -#include "net/base/ev_root_ca_metadata.h" #include "net/base/load_flags.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" @@ -39,10 +37,11 @@ #include "net/base/net_module.h" #include "net/base/net_util.h" #include "net/base/test_data_directory.h" -#include "net/base/test_root_certs.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" +#include "net/cert/ev_root_ca_metadata.h" +#include "net/cert/test_root_certs.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store_test_helpers.h" #include "net/disk_cache/disk_cache.h" @@ -57,6 +56,7 @@ #include "net/proxy/proxy_service.h" #include "net/socket/ssl_client_socket.h" #include "net/ssl/ssl_connection_status_flags.h" +#include "net/test/cert_test_util.h" #include "net/test/test_server.h" #include "net/url_request/ftp_protocol_handler.h" #include "net/url_request/static_http_user_agent_settings.h" diff --git a/remoting/base/rsa_key_pair.cc b/remoting/base/rsa_key_pair.cc index 566bf01..95572f9 100644 --- a/remoting/base/rsa_key_pair.cc +++ b/remoting/base/rsa_key_pair.cc @@ -14,7 +14,7 @@ #include "base/time.h" #include "crypto/rsa_private_key.h" #include "crypto/signature_creator.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace remoting { diff --git a/remoting/host/DEPS b/remoting/host/DEPS index 4bca7ec..dbdf6ac 100644 --- a/remoting/host/DEPS +++ b/remoting/host/DEPS @@ -1,18 +1,6 @@ include_rules = [ "+media/video/capture/screen", - "+net/base", - "+net/dns", - "+net/ftp", - "+net/http", - "+net/proxy", - "+net/ssl", - "+net/test", - "+net/url_request", - - # Note: Only for net::EnableSSLServerSockets(), which must be called by - # at process start. - "+net/socket", - + "+net", "+remoting/codec", "+remoting/protocol", "+remoting/jingle_glue", diff --git a/remoting/host/url_request_context.cc b/remoting/host/url_request_context.cc index 26f7fdc..cf124b4 100644 --- a/remoting/host/url_request_context.cc +++ b/remoting/host/url_request_context.cc @@ -5,7 +5,7 @@ #include "remoting/host/url_request_context.h" #include "base/message_loop_proxy.h" -#include "net/base/cert_verifier.h" +#include "net/cert/cert_verifier.h" #include "net/dns/host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_layer.h" diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h index 8b3900d..7130f3f 100644 --- a/remoting/protocol/jingle_session_manager.h +++ b/remoting/protocol/jingle_session_manager.h @@ -5,12 +5,12 @@ #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ #define REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ -#include <map> #include <list> +#include <map> #include <string> #include "base/memory/ref_counted.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "remoting/jingle_glue/signal_strategy.h" #include "remoting/protocol/jingle_messages.h" #include "remoting/protocol/session_manager.h" diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.cc b/remoting/protocol/ssl_hmac_channel_authenticator.cc index 5643430..b78abf0 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "crypto/secure_util.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/base/x509_certificate.h" +#include "net/cert/cert_verifier.h" +#include "net/cert/x509_certificate.h" #include "net/socket/client_socket_factory.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/ssl_server_socket.h" diff --git a/webkit/DEPS b/webkit/DEPS index f5ae179..d9f2a19 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -38,17 +38,6 @@ include_rules = [ # TODO(brettw) - review these; move up if it's ok, or remove the dependency "+crypto", - "+net/base", - "+net/cookies", - "+net/dns", - "+net/ftp", - "+net/http", - "+net/proxy", - "+net/ssl", - "+net/socket", - "+net/socket_stream", - "+net/test", - "+net/url_request", - "+net/websockets", + "+net", "+third_party/npapi/bindings", ] diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 5febc82..201564d 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/thread_task_runner_handle.h" #include "base/threading/worker_pool.h" -#include "net/base/cert_verifier.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" |