diff options
174 files changed, 328 insertions, 326 deletions
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 78d8e27..869d50b 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -23,7 +23,7 @@ #include "content/public/common/url_constants.h" #include "grit/ui_resources.h" #include "net/android/network_library.h" -#include "net/base/ssl_info.h" +#include "net/ssl/ssl_info.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc index 9d0b141..8cd800c 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.cc +++ b/chrome/browser/browsing_data/browsing_data_remover.cc @@ -54,13 +54,13 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/user_metrics.h" #include "net/base/net_errors.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/server_bound_cert_store.h" -#include "net/base/transport_security_state.h" #include "net/cookies/cookie_store.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" #include "net/http/infinite_cache.h" +#include "net/http/transport_security_state.h" +#include "net/ssl/server_bound_cert_service.h" +#include "net/ssl/server_bound_cert_store.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "webkit/dom_storage/dom_storage_types.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 4d33176..fbd3eb2 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -34,10 +34,10 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/storage_partition.h" #include "content/public/test/test_browser_thread.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/server_bound_cert_store.h" -#include "net/base/ssl_client_cert_type.h" #include "net/cookies/cookie_monster.h" +#include "net/ssl/server_bound_cert_service.h" +#include "net/ssl/server_bound_cert_store.h" +#include "net/ssl/ssl_client_cert_type.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc index 7cad5c3..e18f5ec 100644 --- a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc +++ b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" -#include "net/base/server_bound_cert_service.h" +#include "net/ssl/server_bound_cert_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h index a90c3da..b49546d 100644 --- a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h +++ b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h @@ -9,7 +9,7 @@ #include <string> #include "base/callback.h" -#include "net/base/server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_store.h" class Profile; diff --git a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc index 87e78af..1443f54 100644 --- a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc @@ -9,7 +9,7 @@ #include "base/synchronization/waitable_event.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "net/base/server_bound_cert_service.h" +#include "net/ssl/server_bound_cert_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h index 76735f5..9dc39ea 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.h +++ b/chrome/browser/browsing_data/cookies_tree_model.h @@ -26,7 +26,7 @@ #include "chrome/browser/browsing_data/local_data_container.h" #include "chrome/common/content_settings.h" #include "chrome/common/extensions/extension_set.h" -#include "net/base/server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_store.h" #include "ui/base/models/tree_node_model.h" class BrowsingDataCookieHelper; diff --git a/chrome/browser/browsing_data/local_data_container.h b/chrome/browser/browsing_data/local_data_container.h index 0ad4512..3c383d7 100644 --- a/chrome/browser/browsing_data/local_data_container.h +++ b/chrome/browser/browsing_data/local_data_container.h @@ -21,7 +21,7 @@ #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" #include "chrome/browser/browsing_data/browsing_data_quota_helper.h" #include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h" -#include "net/base/server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_store.h" class BrowsingDataFlashLSOHelper; class CookiesTreeModel; diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index 5c62555..90ac2b9 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -44,7 +44,7 @@ #include "content/test/net/url_request_failed_job.h" #include "content/test/net/url_request_mock_http_job.h" #include "net/base/net_errors.h" -#include "net/base/transport_security_state.h" +#include "net/http/transport_security_state.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/captive_portal/captive_portal_tab_helper.cc b/chrome/browser/captive_portal/captive_portal_tab_helper.cc index c5c8b8c..de2cb3c 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "chrome/browser/captive_portal/captive_portal_login_detector.h" -#include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" #include "chrome/browser/captive_portal/captive_portal_service_factory.h" +#include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" @@ -23,7 +23,7 @@ #include "content/public/browser/resource_request_details.h" #include "content/public/browser/web_contents.h" #include "net/base/net_errors.h" -#include "net/base/ssl_info.h" +#include "net/ssl/ssl_info.h" DEFINE_WEB_CONTENTS_USER_DATA_KEY(captive_portal::CaptivePortalTabHelper); 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 54042d6..d4ef7fa 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc @@ -16,7 +16,7 @@ #include "googleurl/src/gurl.h" #include "net/base/cert_status_flags.h" #include "net/base/net_errors.h" -#include "net/base/ssl_info.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/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 962cf6e..344cb0d 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -114,9 +114,9 @@ #include "grit/ui_resources.h" #include "net/base/escape.h" #include "net/base/mime_util.h" -#include "net/base/ssl_cert_request_info.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_options.h" +#include "net/ssl/ssl_cert_request_info.h" #include "ppapi/host/ppapi_host.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/chromeos/login/profile_auth_data.cc b/chrome/browser/chromeos/login/profile_auth_data.cc index 3c1f252..8615217 100644 --- a/chrome/browser/chromeos/login/profile_auth_data.cc +++ b/chrome/browser/chromeos/login/profile_auth_data.cc @@ -6,13 +6,13 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/server_bound_cert_store.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store.h" #include "net/http/http_auth_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_transaction_factory.h" +#include "net/ssl/server_bound_cert_service.h" +#include "net/ssl/server_bound_cert_store.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 8d939a4..8803c9e 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -54,11 +54,11 @@ #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/ssl_config_service.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/stream_socket.h" +#include "net/ssl/ssl_config_service.h" #include "third_party/libevent/evdns.h" #include "third_party/libevent/event.h" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 94c24bd..173e9804 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -41,14 +41,12 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "net/base/cert_verifier.h" -#include "net/base/default_server_bound_cert_store.h" #include "net/base/host_cache.h" #include "net/base/host_mapping_rules.h" #include "net/base/host_resolver.h" #include "net/base/mapped_host_resolver.h" #include "net/base/net_util.h" #include "net/base/sdch_manager.h" -#include "net/base/server_bound_cert_service.h" #include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_filter.h" @@ -59,6 +57,8 @@ #include "net/proxy/proxy_script_fetcher_impl.h" #include "net/proxy/proxy_service.h" #include "net/spdy/spdy_session.h" +#include "net/ssl/default_server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_service.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_throttler_manager.h" #include "net/websockets/websocket_job.h" diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc index 79f53e3..995e91a 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc @@ -12,10 +12,10 @@ #include "base/time.h" #include "chrome/browser/net/cert_logger.pb.h" #include "net/base/load_flags.h" -#include "net/base/ssl_info.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/x509_certificate.h" +#include "net/ssl/ssl_info.h" #include "net/url_request/url_request_context.h" namespace chrome_browser_net { diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc index c70578d..760a4bf 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc @@ -15,10 +15,10 @@ #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/ssl_info.h" #include "net/base/test_data_directory.h" -#include "net/base/transport_security_state.h" #include "net/base/x509_certificate.h" +#include "net/http/transport_security_state.h" +#include "net/ssl/ssl_info.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 55714c0..34906a6 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -20,7 +20,6 @@ #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" @@ -32,6 +31,7 @@ #include "net/proxy/proxy_script_fetcher_impl.h" #include "net/proxy/proxy_service.h" #include "net/proxy/proxy_service_v8.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index ae440c3..a482ca1 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -8,7 +8,6 @@ #include "content/public/test/test_browser_thread.h" #include "net/base/mock_cert_verifier.h" #include "net/base/mock_host_resolver.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" @@ -17,6 +16,7 @@ #include "net/http/http_server_properties_impl.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/test/test_server.h" #include "net/url_request/url_request_context.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc index ac3f805..f03cc27 100644 --- a/chrome/browser/net/crl_set_fetcher.cc +++ b/chrome/browser/net/crl_set_fetcher.cc @@ -16,7 +16,7 @@ #include "chrome/common/chrome_paths.h" #include "content/public/browser/browser_thread.h" #include "net/base/crl_set.h" -#include "net/base/ssl_config_service.h" +#include "net/ssl/ssl_config_service.h" using content::BrowserThread; diff --git a/chrome/browser/net/preconnect.cc b/chrome/browser/net/preconnect.cc index c63e0e1..3061311 100644 --- a/chrome/browser/net/preconnect.cc +++ b/chrome/browser/net/preconnect.cc @@ -9,11 +9,11 @@ #include "base/metrics/histogram.h" #include "content/public/browser/browser_thread.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service.h" #include "net/http/http_network_session.h" #include "net/http/http_request_info.h" #include "net/http/http_stream_factory.h" #include "net/http/http_transaction_factory.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/net/sqlite_server_bound_cert_store.cc b/chrome/browser/net/sqlite_server_bound_cert_store.cc index 5b03db1..1dfcbf1 100644 --- a/chrome/browser/net/sqlite_server_bound_cert_store.cc +++ b/chrome/browser/net/sqlite_server_bound_cert_store.cc @@ -20,8 +20,8 @@ #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/ssl_client_cert_type.h" #include "net/base/x509_certificate.h" +#include "net/ssl/ssl_client_cert_type.h" #include "sql/meta_table.h" #include "sql/statement.h" #include "sql/transaction.h" diff --git a/chrome/browser/net/sqlite_server_bound_cert_store.h b/chrome/browser/net/sqlite_server_bound_cert_store.h index 7d22424..c82f609 100644 --- a/chrome/browser/net/sqlite_server_bound_cert_store.h +++ b/chrome/browser/net/sqlite_server_bound_cert_store.h @@ -8,7 +8,7 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "net/base/default_server_bound_cert_store.h" +#include "net/ssl/default_server_bound_cert_store.h" class ClearOnExitPolicy; diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index f4dc878..f7679dcb 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -18,8 +18,8 @@ #include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" -#include "net/base/ssl_cipher_suite_names.h" -#include "net/base/ssl_config_service.h" +#include "net/ssl/ssl_cipher_suite_names.h" +#include "net/ssl/ssl_config_service.h" using content::BrowserThread; diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc index e869d7b..42ee693 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "net/base/ssl_config_service.h" +#include "net/ssl/ssl_config_service.h" #include "testing/gtest/include/gtest/gtest.h" using base::ListValue; diff --git a/chrome/browser/net/transport_security_persister.cc b/chrome/browser/net/transport_security_persister.cc index 4d1cf40..7eef2cf 100644 --- a/chrome/browser/net/transport_security_persister.cc +++ b/chrome/browser/net/transport_security_persister.cc @@ -16,8 +16,8 @@ #include "chrome/common/chrome_paths.h" #include "content/public/browser/browser_thread.h" #include "crypto/sha2.h" -#include "net/base/transport_security_state.h" #include "net/base/x509_certificate.h" +#include "net/http/transport_security_state.h" using content::BrowserThread; using net::HashValue; diff --git a/chrome/browser/net/transport_security_persister.h b/chrome/browser/net/transport_security_persister.h index 6c58dcc..36c25fb 100644 --- a/chrome/browser/net/transport_security_persister.h +++ b/chrome/browser/net/transport_security_persister.h @@ -38,7 +38,7 @@ #include "base/files/file_path.h" #include "base/files/important_file_writer.h" #include "base/memory/weak_ptr.h" -#include "net/base/transport_security_state.h" +#include "net/http/transport_security_state.h" // Reads and updates on-disk TransportSecurity state. // Must be created, used and destroyed only on the IO thread. diff --git a/chrome/browser/net/transport_security_persister_unittest.cc b/chrome/browser/net/transport_security_persister_unittest.cc index e60b5d9..4177bc8 100644 --- a/chrome/browser/net/transport_security_persister_unittest.cc +++ b/chrome/browser/net/transport_security_persister_unittest.cc @@ -13,7 +13,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "content/public/test/test_browser_thread.h" -#include "net/base/transport_security_state.h" +#include "net/http/transport_security_state.h" #include "testing/gtest/include/gtest/gtest.h" using net::TransportSecurityState; @@ -213,7 +213,7 @@ TEST_F(TransportSecurityPersisterTest, PublicKeyHashes) { TEST_F(TransportSecurityPersisterTest, ForcePreloads) { // The static state for docs.google.com, defined in - // net/base/transport_security_state_static.h, has pins and mode strict. + // net/http/transport_security_state_static.h, has pins and mode strict. // This new policy overrides that with no pins and a weaker mode. We apply // this new policy with |DeserializeFromCommandLine| and expect that the // new policy is in effect, overriding the static policy. diff --git a/chrome/browser/policy/cloud/device_management_service.cc b/chrome/browser/policy/cloud/device_management_service.cc index e9b635a..253c807 100644 --- a/chrome/browser/policy/cloud/device_management_service.cc +++ b/chrome/browser/policy/cloud/device_management_service.cc @@ -23,11 +23,11 @@ #include "net/base/host_resolver.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/cookies/cookie_monster.h" #include "net/http/http_network_layer.h" #include "net/http/http_response_headers.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 096fb8c..0951bf7 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -48,8 +48,8 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" -#include "net/base/transport_security_state.h" #include "net/http/http_server_properties.h" +#include "net/http/transport_security_state.h" #include "webkit/database/database_tracker.h" #if defined(OS_ANDROID) diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc index 411de3a..4029bc3 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.cc +++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc @@ -27,12 +27,12 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_context.h" #include "extensions/common/constants.h" -#include "net/base/default_server_bound_cert_store.h" -#include "net/base/server_bound_cert_service.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" +#include "net/ssl/default_server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_service.h" #include "net/url_request/protocol_intercept_job_factory.h" #include "net/url_request/url_request_job_factory_impl.h" #include "webkit/database/database_tracker.h" diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index 644377d..38e5d87 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -36,9 +36,9 @@ #include "content/public/browser/resource_context.h" #include "content/public/browser/storage_partition.h" #include "extensions/common/constants.h" -#include "net/base/server_bound_cert_service.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_cache.h" +#include "net/ssl/server_bound_cert_service.h" #include "net/url_request/protocol_intercept_job_factory.h" #include "net/url_request/url_request_job_factory_impl.h" #include "webkit/quota/special_storage_policy.h" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 96348ef..1449f54 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -58,7 +58,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/resource_context.h" #include "extensions/common/constants.h" -#include "net/base/server_bound_cert_service.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_monster.h" #include "net/http/http_transaction_factory.h" @@ -66,6 +65,7 @@ #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_script_fetcher_impl.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/server_bound_cert_service.h" #include "net/url_request/data_protocol_handler.h" #include "net/url_request/file_protocol_handler.h" #include "net/url_request/ftp_protocol_handler.h" diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index 82df13a..13e6aa1 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -41,8 +41,8 @@ #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/resource_request_info.h" #include "net/base/load_flags.h" -#include "net/base/ssl_config_service.h" #include "net/http/http_response_headers.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/url_request.h" #if defined(ENABLE_MANAGED_USERS) diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h index 69c96fa..4d7b2f2 100644 --- a/chrome/browser/ssl/ssl_blocking_page.h +++ b/chrome/browser/ssl/ssl_blocking_page.h @@ -11,9 +11,9 @@ #include "base/callback.h" #include "base/string16.h" #include "base/time.h" -#include "net/base/ssl_info.h" #include "content/public/browser/interstitial_page_delegate.h" #include "googleurl/src/gurl.h" +#include "net/ssl/ssl_info.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/ssl/ssl_client_auth_observer.cc b/chrome/browser/ssl/ssl_client_auth_observer.cc index 3365641..cbdaace 100644 --- a/chrome/browser/ssl/ssl_client_auth_observer.cc +++ b/chrome/browser/ssl/ssl_client_auth_observer.cc @@ -11,8 +11,8 @@ #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" -#include "net/base/ssl_cert_request_info.h" #include "net/base/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 c2fd114..751b352 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc +++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc @@ -13,10 +13,10 @@ #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/ssl_cert_request_info.h" #include "net/base/test_data_directory.h" #include "net/base/x509_certificate.h" #include "net/http/http_transaction_factory.h" +#include "net/ssl/ssl_cert_request_info.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 d33960e..c119477 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -14,7 +14,7 @@ #include "net/base/cert_status_flags.h" #include "net/base/escape.h" #include "net/base/net_errors.h" -#include "net/base/ssl_info.h" +#include "net/ssl/ssl_info.h" #include "ui/base/l10n/l10n_util.h" SSLErrorInfo::SSLErrorInfo(const string16& title, diff --git a/chrome/browser/ui/android/ssl_client_certificate_request.cc b/chrome/browser/ui/android/ssl_client_certificate_request.cc index c5df83e..965cfc9 100644 --- a/chrome/browser/ui/android/ssl_client_certificate_request.cc +++ b/chrome/browser/ui/android/ssl_client_certificate_request.cc @@ -17,9 +17,9 @@ #include "net/android/keystore_openssl.h" #include "net/base/host_port_pair.h" #include "net/base/openssl_client_key_store.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_client_cert_type.h" #include "net/base/x509_certificate.h" +#include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_client_cert_type.h" namespace chrome { 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 c20ac4d..ea0856e 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm @@ -11,15 +11,15 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" #include "chrome/browser/ssl/ssl_client_auth_observer.h" +#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" -#include "net/base/ssl_cert_request_info.h" #include "net/base/x509_certificate.h" #include "net/base/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/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc index 39afc02..6a7e88e 100644 --- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc @@ -21,8 +21,8 @@ #include "chrome/common/net/x509_certificate_model.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" -#include "net/base/ssl_cert_request_info.h" #include "net/base/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" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index 3dda77c..6389290 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -15,8 +15,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" -#include "net/base/ssl_cert_request_info.h" #include "net/base/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" #include "ui/base/models/table_model_observer.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 85f161b..a2ef9dd 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -16,10 +16,10 @@ #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/ssl_cert_request_info.h" #include "net/base/test_data_directory.h" #include "net/base/x509_certificate.h" #include "net/http/http_transaction_factory.h" +#include "net/ssl/ssl_cert_request_info.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 61e682a..86f95d8 100644 --- a/chrome/browser/ui/website_settings/website_settings.cc +++ b/chrome/browser/ui/website_settings/website_settings.cc @@ -39,9 +39,9 @@ #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/ssl_cipher_suite_names.h" -#include "net/base/ssl_connection_status_flags.h" #include "net/base/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" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc index 767d041..5d92dde 100644 --- a/chrome/browser/ui/website_settings/website_settings_unittest.cc +++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc @@ -23,9 +23,9 @@ #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/ssl_connection_status_flags.h" #include "net/base/test_certificate_data.h" #include "net/base/x509_certificate.h" +#include "net/ssl/ssl_connection_status_flags.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 6777806..3bb1d48 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -60,13 +60,13 @@ #include "net/base/host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" -#include "net/base/transport_security_state.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties.h" #include "net/http/http_stream_factory.h" +#include "net/http/transport_security_state.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc index 3bb5565..82cac59 100644 --- a/chrome/service/net/service_url_request_context.cc +++ b/chrome/service/net/service_url_request_context.cc @@ -16,7 +16,6 @@ #include "chrome/service/service_process.h" #include "net/base/cert_verifier.h" #include "net/base/host_resolver.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" @@ -25,6 +24,7 @@ #include "net/http/http_server_properties_impl.h" #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request_throttler_manager.h" diff --git a/chrome/service/net/service_url_request_context.h b/chrome/service/net/service_url_request_context.h index aa06778..6bcc7e0 100644 --- a/chrome/service/net/service_url_request_context.h +++ b/chrome/service/net/service_url_request_context.h @@ -9,13 +9,13 @@ #include "base/memory/scoped_ptr.h" #include "net/base/host_resolver.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context_storage.h" diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc index 969ee35..cac0e2c 100644 --- a/content/browser/browser_context.cc +++ b/content/browser/browser_context.cc @@ -11,16 +11,16 @@ #include "content/browser/download/download_manager_impl.h" #include "content/browser/in_process_webkit/indexed_db_context_impl.h" #include "content/browser/loader/resource_dispatcher_host_impl.h" -#include "content/public/browser/site_instance.h" #include "content/browser/storage_partition_impl.h" #include "content/browser/storage_partition_impl_map.h" #include "content/common/child_process_host_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/server_bound_cert_store.h" +#include "content/public/browser/site_instance.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store.h" +#include "net/ssl/server_bound_cert_service.h" +#include "net/ssl/server_bound_cert_store.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/clipboard/clipboard.h" diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 03fb379..7b05cb8 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -45,9 +45,9 @@ #include "crypto/nss_util.h" #include "media/audio/audio_manager.h" #include "net/base/network_change_notifier.h" -#include "net/base/ssl_config_service.h" #include "net/socket/client_socket_factory.h" #include "net/socket/tcp_client_socket.h" +#include "net/ssl/ssl_config_service.h" #include "ui/base/clipboard/clipboard.h" #if defined(USE_AURA) @@ -69,8 +69,8 @@ #include "content/browser/system_message_window_win.h" #include "content/common/sandbox_policy.h" -#include "ui/base/l10n/l10n_util_win.h" #include "net/base/winsock_init.h" +#include "ui/base/l10n/l10n_util_win.h" #endif #if defined(OS_LINUX) || defined(OS_OPENBSD) diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index de3c2d8..3c7c786 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -68,13 +68,13 @@ #include "net/base/net_errors.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/base/request_priority.h" -#include "net/base/ssl_cert_request_info.h" #include "net/base/upload_data_stream.h" #include "net/cookies/cookie_monster.h" #include "net/http/http_cache.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" #include "net/http/http_transaction_factory.h" +#include "net/ssl/ssl_cert_request_info.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job_factory.h" diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc index e4716dd..aae735c 100644 --- a/content/browser/loader/resource_loader.cc +++ b/content/browser/loader/resource_loader.cc @@ -21,10 +21,10 @@ #include "content/public/common/content_switches.h" #include "content/public/common/resource_response.h" #include "content/public/common/url_constants.h" -#include "net/base/client_cert_store.h" -#include "net/base/client_cert_store_impl.h" #include "net/base/load_flags.h" #include "net/http/http_response_headers.h" +#include "net/ssl/client_cert_store.h" +#include "net/ssl/client_cert_store_impl.h" #include "webkit/appcache/appcache_interceptor.h" using base::TimeDelta; diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc index 135f41c..781b62c 100644 --- a/content/browser/loader/resource_loader_unittest.cc +++ b/content/browser/loader/resource_loader_unittest.cc @@ -10,9 +10,9 @@ #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/client_cert_store.h" -#include "net/base/ssl_cert_request_info.h" #include "net/base/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" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h index 5956c75..2494b6e 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_message_filter.h @@ -20,8 +20,8 @@ #include "content/public/common/process_type.h" #include "net/base/net_util.h" #include "net/base/network_change_notifier.h" -#include "net/base/ssl_config_service.h" #include "net/socket/stream_socket.h" +#include "net/ssl/ssl_config_service.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/private/ppb_flash.h" diff --git a/content/browser/ssl/ssl_cert_error_handler.h b/content/browser/ssl/ssl_cert_error_handler.h index 914bb3e..696fb81 100644 --- a/content/browser/ssl/ssl_cert_error_handler.h +++ b/content/browser/ssl/ssl_cert_error_handler.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "content/browser/ssl/ssl_error_handler.h" -#include "net/base/ssl_info.h" +#include "net/ssl/ssl_info.h" namespace content { diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h index 54f0999..9bd8275 100644 --- a/content/browser/ssl/ssl_client_auth_handler.h +++ b/content/browser/ssl/ssl_client_auth_handler.h @@ -10,7 +10,7 @@ #include "base/sequenced_task_runner_helpers.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h" -#include "net/base/ssl_cert_request_info.h" +#include "net/ssl/ssl_cert_request_info.h" namespace net { class HttpNetworkSession; diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc index c88e1e0..750bf47 100644 --- a/content/browser/ssl/ssl_policy.cc +++ b/content/browser/ssl/ssl_policy.cc @@ -4,8 +4,8 @@ #include "content/browser/ssl/ssl_policy.h" -#include "base/bind.h" #include "base/base_switches.h" +#include "base/bind.h" #include "base/command_line.h" #include "base/memory/singleton.h" #include "base/string_piece.h" @@ -20,7 +20,7 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/common/ssl_status.h" #include "content/public/common/url_constants.h" -#include "net/base/ssl_info.h" +#include "net/ssl/ssl_info.h" #include "webkit/glue/resource_type.h" diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc index eaef4ae..33b4d1f 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/shell_url_request_context_getter.cc @@ -16,17 +16,17 @@ #include "content/shell/shell_network_delegate.h" #include "content/shell/shell_switches.h" #include "net/base/cert_verifier.h" -#include "net/base/default_server_bound_cert_store.h" #include "net/base/host_resolver.h" #include "net/base/mapped_host_resolver.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/cookies/cookie_monster.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/default_server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/protocol_intercept_job_factory.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request_context.h" diff --git a/jingle/glue/chrome_async_socket.cc b/jingle/glue/chrome_async_socket.cc index 667ec7d..5dc8bb1 100644 --- a/jingle/glue/chrome_async_socket.cc +++ b/jingle/glue/chrome_async_socket.cc @@ -5,8 +5,8 @@ #include "jingle/glue/chrome_async_socket.h" #include <algorithm> -#include <cstring> #include <cstdlib> +#include <cstring> #include "base/basictypes.h" #include "base/bind.h" @@ -18,10 +18,10 @@ #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/net_util.h" -#include "net/base/ssl_config_service.h" #include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/tcp_client_socket.h" +#include "net/ssl/ssl_config_service.h" #include "third_party/libjingle/source/talk/base/socketaddress.h" namespace jingle_glue { diff --git a/jingle/glue/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc index 1681dbd..058c5ea 100644 --- a/jingle/glue/chrome_async_socket_unittest.cc +++ b/jingle/glue/chrome_async_socket_unittest.cc @@ -16,9 +16,9 @@ #include "net/base/mock_cert_verifier.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" -#include "net/base/ssl_config_service.h" #include "net/socket/socket_test_util.h" #include "net/socket/ssl_client_socket.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/libjingle/source/talk/base/ipaddress.h" diff --git a/jingle/glue/proxy_resolving_client_socket.h b/jingle/glue/proxy_resolving_client_socket.h index eb1e4de..fee8fbc 100644 --- a/jingle/glue/proxy_resolving_client_socket.h +++ b/jingle/glue/proxy_resolving_client_socket.h @@ -17,10 +17,10 @@ #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service.h" #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_service.h" #include "net/socket/stream_socket.h" +#include "net/ssl/ssl_config_service.h" namespace net { class ClientSocketFactory; diff --git a/jingle/glue/xmpp_client_socket_factory.h b/jingle/glue/xmpp_client_socket_factory.h index f03a04e..c2a0d6a 100644 --- a/jingle/glue/xmpp_client_socket_factory.h +++ b/jingle/glue/xmpp_client_socket_factory.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "jingle/glue/resolving_client_socket_factory.h" -#include "net/base/ssl_config_service.h" +#include "net/ssl/ssl_config_service.h" namespace net { class ClientSocketFactory; diff --git a/jingle/notifier/base/xmpp_connection.cc b/jingle/notifier/base/xmpp_connection.cc index 2284c7f..8bcb197 100644 --- a/jingle/notifier/base/xmpp_connection.cc +++ b/jingle/notifier/base/xmpp_connection.cc @@ -12,8 +12,8 @@ #include "jingle/glue/task_pump.h" #include "jingle/glue/xmpp_client_socket_factory.h" #include "jingle/notifier/base/weak_xmpp_client.h" -#include "net/base/ssl_config_service.h" #include "net/socket/client_socket_factory.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/url_request_context.h" #include "talk/xmpp/xmppclientsettings.h" diff --git a/net/android/keystore.h b/net/android/keystore.h index 6267719..32f0723 100644 --- a/net/android/keystore.h +++ b/net/android/keystore.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/string_piece.h" #include "net/base/net_export.h" -#include "net/base/ssl_client_cert_type.h" +#include "net/ssl/ssl_client_cert_type.h" // Avoid including <openssl/evp.h> here. typedef struct evp_pkey_st EVP_PKEY; diff --git a/net/android/keystore_openssl.cc b/net/android/keystore_openssl.cc index 900bf85..cc463f4 100644 --- a/net/android/keystore_openssl.cc +++ b/net/android/keystore_openssl.cc @@ -27,7 +27,7 @@ #include "base/logging.h" #include "crypto/openssl_util.h" #include "net/android/keystore.h" -#include "net/base/ssl_client_cert_type.h" +#include "net/ssl/ssl_client_cert_type.h" // IMPORTANT NOTE: The following code will currently only work when used // to implement client certificate support with OpenSSL. That's because diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h index c0c71ea..f0bb1b2 100644 --- a/net/base/net_error_list.h +++ b/net/base/net_error_list.h @@ -273,7 +273,7 @@ NET_ERROR(SSL_HANDSHAKE_NOT_COMPLETED, -148) NET_ERROR(SSL_BAD_PEER_PUBLIC_KEY, -149) // The certificate didn't match the built-in public key pins for the host name. -// The pins are set in net/base/transport_security_state.cc and require that +// The pins are set in net/http/transport_security_state.cc and require that // one of a set of public keys exist on the path from the leaf to the root. NET_ERROR(SSL_PINNED_KEY_NOT_IN_CERT_CHAIN, -150) diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index 1bf72cb..ab6403e 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -27,17 +27,17 @@ #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_config_service.h" #include "net/base/upload_data_stream.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_request_info.h" #include "net/http/http_response_headers.h" -#include "net/http/http_transaction_delegate.h" #include "net/http/http_transaction.h" +#include "net/http/http_transaction_delegate.h" #include "net/http/http_util.h" #include "net/http/partial_data.h" +#include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_config_service.h" using base::Time; using base::TimeDelta; diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc index 2225576..c0c198e 100644 --- a/net/http/http_cache_unittest.cc +++ b/net/http/http_cache_unittest.cc @@ -16,7 +16,6 @@ #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/base/net_log_unittest.h" -#include "net/base/ssl_cert_request_info.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/disk_cache/disk_cache.h" @@ -30,6 +29,7 @@ #include "net/http/http_transaction_unittest.h" #include "net/http/http_util.h" #include "net/http/mock_http_cache.h" +#include "net/ssl/ssl_cert_request_info.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc index 0891724..c439f89 100644 --- a/net/http/http_network_layer_unittest.cc +++ b/net/http/http_network_layer_unittest.cc @@ -7,13 +7,13 @@ #include "net/base/mock_cert_verifier.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" #include "net/http/http_transaction_unittest.h" #include "net/proxy/proxy_service.h" #include "net/socket/socket_test_util.h" #include "net/spdy/spdy_session_pool.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index 9b6e771..db9d762 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h @@ -11,11 +11,11 @@ #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" #include "net/base/net_export.h" -#include "net/base/ssl_client_auth_cache.h" #include "net/http/http_auth_cache.h" #include "net/http/http_stream_factory.h" #include "net/quic/quic_stream_factory.h" #include "net/spdy/spdy_session_pool.h" +#include "net/ssl/ssl_client_auth_cache.h" namespace base { class Value; diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 5b120f7..5a39e6a 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -29,8 +29,6 @@ #include "net/base/load_timing_info.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_connection_status_flags.h" #include "net/base/upload_data_stream.h" #include "net/http/http_auth.h" #include "net/http/http_auth_handler.h" @@ -58,6 +56,8 @@ #include "net/spdy/spdy_http_stream.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_session_pool.h" +#include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_connection_status_flags.h" using base::Time; diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h index 47f7d91..87ce691 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -14,13 +14,13 @@ #include "base/time.h" #include "net/base/net_log.h" #include "net/base/request_priority.h" -#include "net/base/ssl_config_service.h" #include "net/http/http_auth.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_info.h" #include "net/http/http_stream_factory.h" #include "net/http/http_transaction.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service.h" namespace net { diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index 7064553..b84989a 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -31,9 +31,6 @@ #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_config_service_defaults.h" -#include "net/base/ssl_info.h" #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" #include "net/base/upload_bytes_element_reader.h" @@ -60,6 +57,9 @@ #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_test_util_spdy2.h" +#include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_config_service_defaults.h" +#include "net/ssl/ssl_info.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 51313c6..6929375 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -31,9 +31,6 @@ #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_config_service_defaults.h" -#include "net/base/ssl_info.h" #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" #include "net/base/upload_bytes_element_reader.h" @@ -60,6 +57,9 @@ #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_test_util_spdy3.h" +#include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_config_service_defaults.h" +#include "net/ssl/ssl_info.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/http/http_pipelined_connection_impl.h b/net/http/http_pipelined_connection_impl.h index eb8dbcd..f49fb12 100644 --- a/net/http/http_pipelined_connection_impl.h +++ b/net/http/http_pipelined_connection_impl.h @@ -16,11 +16,11 @@ #include "net/base/completion_callback.h" #include "net/base/net_export.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service.h" #include "net/http/http_pipelined_connection.h" #include "net/http/http_request_info.h" #include "net/http/http_stream_parser.h" #include "net/proxy/proxy_info.h" +#include "net/ssl/ssl_config_service.h" namespace net { diff --git a/net/http/http_pipelined_host_forced_unittest.cc b/net/http/http_pipelined_host_forced_unittest.cc index 04d2158..37732aa 100644 --- a/net/http/http_pipelined_host_forced_unittest.cc +++ b/net/http/http_pipelined_host_forced_unittest.cc @@ -5,10 +5,10 @@ #include "net/http/http_pipelined_host_forced.h" #include "base/memory/scoped_ptr.h" -#include "net/base/ssl_config_service.h" #include "net/http/http_pipelined_host_test_util.h" #include "net/proxy/proxy_info.h" #include "net/socket/client_socket_handle.h" +#include "net/ssl/ssl_config_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/http/http_pipelined_host_impl_unittest.cc b/net/http/http_pipelined_host_impl_unittest.cc index 2764edf..ea49e12 100644 --- a/net/http/http_pipelined_host_impl_unittest.cc +++ b/net/http/http_pipelined_host_impl_unittest.cc @@ -5,10 +5,10 @@ #include "net/http/http_pipelined_host_impl.h" #include "base/memory/scoped_ptr.h" -#include "net/base/ssl_config_service.h" #include "net/http/http_pipelined_connection.h" #include "net/http/http_pipelined_host_test_util.h" #include "net/proxy/proxy_info.h" +#include "net/ssl/ssl_config_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/http/http_pipelined_host_pool_unittest.cc b/net/http/http_pipelined_host_pool_unittest.cc index 3064f23..8413e26 100644 --- a/net/http/http_pipelined_host_pool_unittest.cc +++ b/net/http/http_pipelined_host_pool_unittest.cc @@ -6,11 +6,11 @@ #include "base/memory/scoped_ptr.h" #include "base/rand_util.h" -#include "net/base/ssl_config_service.h" #include "net/http/http_pipelined_host.h" #include "net/http/http_pipelined_host_capability.h" #include "net/http/http_server_properties_impl.h" #include "net/proxy/proxy_info.h" +#include "net/ssl/ssl_config_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/http/http_pipelined_host_test_util.cc b/net/http/http_pipelined_host_test_util.cc index 6e58779..5162e98 100644 --- a/net/http/http_pipelined_host_test_util.cc +++ b/net/http/http_pipelined_host_test_util.cc @@ -4,8 +4,8 @@ #include "net/http/http_pipelined_host_test_util.h" -#include "net/base/ssl_config_service.h" #include "net/proxy/proxy_info.h" +#include "net/ssl/ssl_config_service.h" namespace net { diff --git a/net/http/http_pipelined_network_transaction_unittest.cc b/net/http/http_pipelined_network_transaction_unittest.cc index fec3f866..2fe20f4 100644 --- a/net/http/http_pipelined_network_transaction_unittest.cc +++ b/net/http/http_pipelined_network_transaction_unittest.cc @@ -16,7 +16,6 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/request_priority.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/http/http_auth_handler_mock.h" #include "net/http/http_network_session.h" #include "net/http/http_network_transaction.h" @@ -28,6 +27,7 @@ #include "net/socket/client_socket_pool_histograms.h" #include "net/socket/client_socket_pool_manager.h" #include "net/socket/socket_test_util.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc index e3cdb86..d0357af 100644 --- a/net/http/http_proxy_client_socket_pool.cc +++ b/net/http/http_proxy_client_socket_pool.cc @@ -12,7 +12,6 @@ #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" -#include "net/base/ssl_cert_request_info.h" #include "net/http/http_network_session.h" #include "net/http/http_proxy_client_socket.h" #include "net/socket/client_socket_factory.h" @@ -25,6 +24,7 @@ #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_stream.h" +#include "net/ssl/ssl_cert_request_info.h" namespace net { diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc index d6bde8a..57cb8e0 100644 --- a/net/http/http_response_body_drainer_unittest.cc +++ b/net/http/http_response_body_drainer_unittest.cc @@ -12,12 +12,12 @@ #include "base/message_loop.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/base/test_completion_callback.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" #include "net/http/http_stream.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc index 3767760..53c2121 100644 --- a/net/http/http_response_info.cc +++ b/net/http/http_response_info.cc @@ -10,9 +10,9 @@ #include "net/base/auth.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/ssl_cert_request_info.h" #include "net/base/x509_certificate.h" #include "net/http/http_response_headers.h" +#include "net/ssl/ssl_cert_request_info.h" using base::Time; diff --git a/net/http/http_response_info.h b/net/http/http_response_info.h index c150e82..c4ba2bd 100644 --- a/net/http/http_response_info.h +++ b/net/http/http_response_info.h @@ -10,8 +10,8 @@ #include "base/time.h" #include "net/base/host_port_pair.h" #include "net/base/net_export.h" -#include "net/base/ssl_info.h" #include "net/http/http_vary_data.h" +#include "net/ssl/ssl_info.h" class Pickle; diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc index 7fb8f17..a3113e6 100644 --- a/net/http/http_stream_factory_impl_job.cc +++ b/net/http/http_stream_factory_impl_job.cc @@ -15,7 +15,6 @@ #include "net/base/connection_type_histograms.h" #include "net/base/net_log.h" #include "net/base/net_util.h" -#include "net/base/ssl_cert_request_info.h" #include "net/http/http_basic_stream.h" #include "net/http/http_network_session.h" #include "net/http/http_pipelined_connection.h" @@ -38,6 +37,7 @@ #include "net/spdy/spdy_http_stream.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_session_pool.h" +#include "net/ssl/ssl_cert_request_info.h" namespace net { diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h index 5344b38..20d28b0 100644 --- a/net/http/http_stream_factory_impl_job.h +++ b/net/http/http_stream_factory_impl_job.h @@ -10,7 +10,6 @@ #include "base/memory/weak_ptr.h" #include "net/base/completion_callback.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service.h" #include "net/http/http_auth.h" #include "net/http/http_auth_controller.h" #include "net/http/http_pipelined_host.h" @@ -20,6 +19,7 @@ #include "net/quic/quic_stream_factory.h" #include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" +#include "net/ssl/ssl_config_service.h" namespace net { diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc index 3608e46..ce41010 100644 --- a/net/http/http_stream_factory_impl_unittest.cc +++ b/net/http/http_stream_factory_impl_unittest.cc @@ -10,7 +10,6 @@ #include "net/base/mock_cert_verifier.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/base/test_completion_callback.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" @@ -24,6 +23,7 @@ #include "net/socket/socket_test_util.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_session_pool.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/transport_security_state.cc b/net/http/transport_security_state.cc index 50b4dac..05ec5a9 100644 --- a/net/base/transport_security_state.cc +++ b/net/http/transport_security_state.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/transport_security_state.h" +#include "net/http/transport_security_state.h" #if defined(USE_OPENSSL) #include <openssl/ecdsa.h> @@ -11,8 +11,8 @@ #include <cryptohi.h> #include <hasht.h> #include <keyhi.h> -#include <pk11pub.h> #include <nspr.h> +#include <pk11pub.h> #endif #include <algorithm> @@ -31,10 +31,10 @@ #include "crypto/sha2.h" #include "googleurl/src/gurl.h" #include "net/base/dns_util.h" -#include "net/base/ssl_info.h" #include "net/base/x509_cert_types.h" #include "net/base/x509_certificate.h" #include "net/http/http_security_headers.h" +#include "net/ssl/ssl_info.h" #if defined(USE_OPENSSL) #include "crypto/openssl_util.h" @@ -582,7 +582,7 @@ static bool HasPreload(const struct HSTSPreload* entries, size_t num_entries, return false; } -#include "net/base/transport_security_state_static.h" +#include "net/http/transport_security_state_static.h" // Returns the HSTSPreload entry for the |canonicalized_host| in |entries|, // or NULL if there is none. Prefers exact hostname matches to those that diff --git a/net/base/transport_security_state.h b/net/http/transport_security_state.h index 8eb76d1..ad05b22 100644 --- a/net/base/transport_security_state.h +++ b/net/http/transport_security_state.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_TRANSPORT_SECURITY_STATE_H_ -#define NET_BASE_TRANSPORT_SECURITY_STATE_H_ +#ifndef NET_HTTP_TRANSPORT_SECURITY_STATE_H_ +#define NET_HTTP_TRANSPORT_SECURITY_STATE_H_ #include <map> #include <string> @@ -322,4 +322,4 @@ class NET_EXPORT TransportSecurityState } // namespace net -#endif // NET_BASE_TRANSPORT_SECURITY_STATE_H_ +#endif // NET_HTTP_TRANSPORT_SECURITY_STATE_H_ diff --git a/net/base/transport_security_state_static.certs b/net/http/transport_security_state_static.certs index ea717b2..ea717b2 100644 --- a/net/base/transport_security_state_static.certs +++ b/net/http/transport_security_state_static.certs diff --git a/net/base/transport_security_state_static.h b/net/http/transport_security_state_static.h index 47bf35e..5bb712c 100644 --- a/net/base/transport_security_state_static.h +++ b/net/http/transport_security_state_static.h @@ -4,8 +4,8 @@ // This file is automatically generated by transport_security_state_static_generate.go -#ifndef NET_BASE_TRANSPORT_SECURITY_STATE_STATIC_H_ -#define NET_BASE_TRANSPORT_SECURITY_STATE_STATIC_H_ +#ifndef NET_HTTP_TRANSPORT_SECURITY_STATE_STATIC_H_ +#define NET_HTTP_TRANSPORT_SECURITY_STATE_STATIC_H_ // These are SubjectPublicKeyInfo hashes for public key pinning. The // hashes are SHA1 digests. @@ -800,4 +800,4 @@ static const struct HSTSPreload kPreloadedSNISTS[] = { }; static const size_t kNumPreloadedSNISTS = ARRAYSIZE_UNSAFE(kPreloadedSNISTS); -#endif // NET_BASE_TRANSPORT_SECURITY_STATE_STATIC_H_ +#endif // NET_HTTP_TRANSPORT_SECURITY_STATE_STATIC_H_ diff --git a/net/base/transport_security_state_static.json b/net/http/transport_security_state_static.json index f18eda3..f18eda3 100644 --- a/net/base/transport_security_state_static.json +++ b/net/http/transport_security_state_static.json diff --git a/net/base/transport_security_state_unittest.cc b/net/http/transport_security_state_unittest.cc index 0d0a58f..093f844 100644 --- a/net/base/transport_security_state_unittest.cc +++ b/net/http/transport_security_state_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/transport_security_state.h" +#include "net/http/transport_security_state.h" #include <algorithm> #include <string> @@ -19,13 +19,13 @@ #include "net/base/cert_verify_result.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/ssl_info.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/http/http_util.h" +#include "net/ssl/ssl_info.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(USE_OPENSSL) diff --git a/net/net.gyp b/net/net.gyp index 49e0b0e..3c88a24 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -120,11 +120,6 @@ 'base/cert_verify_proc_win.h', 'base/cert_verify_result.cc', 'base/cert_verify_result.h', - 'base/client_cert_store.h', - 'base/client_cert_store_impl.h', - 'base/client_cert_store_impl_mac.cc', - 'base/client_cert_store_impl_nss.cc', - 'base/client_cert_store_impl_win.cc', 'base/completion_callback.h', 'base/connection_type_histograms.cc', 'base/connection_type_histograms.h', @@ -135,8 +130,6 @@ 'base/crypto_module_openssl.cc', 'base/data_url.cc', 'base/data_url.h', - 'base/default_server_bound_cert_store.cc', - 'base/default_server_bound_cert_store.h', 'base/directory_lister.cc', 'base/directory_lister.h', 'base/dns_reloader.cc', @@ -264,27 +257,10 @@ 'base/sdch_filter.h', 'base/sdch_manager.cc', 'base/sdch_manager.h', - 'base/server_bound_cert_service.cc', - 'base/server_bound_cert_service.h', - 'base/server_bound_cert_store.cc', - 'base/server_bound_cert_store.h', 'base/single_request_cert_verifier.cc', 'base/single_request_cert_verifier.h', 'base/single_request_host_resolver.cc', 'base/single_request_host_resolver.h', - 'base/ssl_cert_request_info.cc', - 'base/ssl_cert_request_info.h', - 'base/ssl_cipher_suite_names.cc', - 'base/ssl_cipher_suite_names.h', - 'base/ssl_client_auth_cache.cc', - 'base/ssl_client_auth_cache.h', - 'base/ssl_client_cert_type.h', - 'base/ssl_config_service.cc', - 'base/ssl_config_service.h', - 'base/ssl_config_service_defaults.cc', - 'base/ssl_config_service_defaults.h', - 'base/ssl_info.cc', - 'base/ssl_info.h', 'base/static_cookie_policy.cc', 'base/static_cookie_policy.h', 'base/stream_listen_socket.cc', @@ -301,9 +277,6 @@ 'base/test_root_certs_openssl.cc', 'base/test_root_certs_android.cc', 'base/test_root_certs_win.cc', - 'base/transport_security_state.cc', - 'base/transport_security_state.h', - 'base/transport_security_state_static.h', 'base/unix_domain_socket_posix.cc', 'base/unix_domain_socket_posix.h', 'base/upload_bytes_element_reader.cc', @@ -608,6 +581,9 @@ 'http/partial_data.h', 'http/proxy_client_socket.h', 'http/proxy_client_socket.cc', + 'http/transport_security_state.cc', + 'http/transport_security_state.h', + 'http/transport_security_state_static.h', 'http/url_security_manager.cc', 'http/url_security_manager.h', 'http/url_security_manager_posix.cc', @@ -872,6 +848,30 @@ 'spdy/spdy_stream.h', 'spdy/spdy_websocket_stream.cc', 'spdy/spdy_websocket_stream.h', + 'ssl/client_cert_store.h', + 'ssl/client_cert_store_impl.h', + 'ssl/client_cert_store_impl_mac.cc', + 'ssl/client_cert_store_impl_nss.cc', + 'ssl/client_cert_store_impl_win.cc', + 'ssl/default_server_bound_cert_store.cc', + 'ssl/default_server_bound_cert_store.h', + 'ssl/server_bound_cert_service.cc', + 'ssl/server_bound_cert_service.h', + 'ssl/server_bound_cert_store.cc', + 'ssl/server_bound_cert_store.h', + 'ssl/ssl_cert_request_info.cc', + 'ssl/ssl_cert_request_info.h', + 'ssl/ssl_cipher_suite_names.cc', + 'ssl/ssl_cipher_suite_names.h', + 'ssl/ssl_client_auth_cache.cc', + 'ssl/ssl_client_auth_cache.h', + 'ssl/ssl_client_cert_type.h', + 'ssl/ssl_config_service.cc', + 'ssl/ssl_config_service.h', + 'ssl/ssl_config_service_defaults.cc', + 'ssl/ssl_config_service_defaults.h', + 'ssl/ssl_info.cc', + 'ssl/ssl_info.h', 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 'third_party/mozilla_security_manager/nsKeygenHandler.h', 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', @@ -1080,7 +1080,6 @@ 'base/cert_database_nss.cc', 'base/cert_verify_proc_nss.cc', 'base/cert_verify_proc_nss.h', - 'base/client_cert_store_impl_nss.cc', 'base/crypto_module_nss.cc', 'base/keygen_handler_nss.cc', 'base/nss_cert_database.cc', @@ -1099,6 +1098,7 @@ 'socket/ssl_client_socket_nss.h', 'socket/ssl_server_socket_nss.cc', 'socket/ssl_server_socket_nss.h', + 'ssl/client_cert_store_impl_nss.cc', 'quic/crypto/p256_key_exchange_nss.cc', 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 'third_party/mozilla_security_manager/nsKeygenHandler.h', @@ -1196,7 +1196,7 @@ 'sources!': [ 'base/cert_verify_proc_nss.cc', 'base/cert_verify_proc_nss.h', - 'base/client_cert_store_impl_nss.cc', + 'ssl/client_cert_store_impl_nss.cc', ], }], [ 'enable_websockets != 1', { @@ -1211,12 +1211,12 @@ }], [ 'OS == "win"', { 'sources!': [ - 'base/client_cert_store_impl_nss.cc', 'http/http_auth_handler_ntlm_portable.cc', 'socket/tcp_client_socket_libevent.cc', 'socket/tcp_client_socket_libevent.h', 'socket/tcp_server_socket_libevent.cc', 'socket/tcp_server_socket_libevent.h', + 'ssl/client_cert_store_impl_nss.cc', 'udp/udp_socket_libevent.cc', 'udp/udp_socket_libevent.h', ], @@ -1241,7 +1241,7 @@ ], [ 'OS == "mac"', { 'sources!': [ - 'base/client_cert_store_impl_nss.cc', + 'ssl/client_cert_store_impl_nss.cc', ], 'dependencies': [ '../third_party/nss/nss.gyp:nspr', @@ -1365,10 +1365,8 @@ 'base/backoff_entry_unittest.cc', 'base/big_endian_unittest.cc', 'base/cert_verify_proc_unittest.cc', - 'base/client_cert_store_impl_unittest.cc', 'base/crl_set_unittest.cc', 'base/data_url_unittest.cc', - 'base/default_server_bound_cert_store_unittest.cc', 'base/directory_lister_unittest.cc', 'base/dns_util_unittest.cc', 'base/escape_unittest.cc', @@ -1401,17 +1399,12 @@ 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc', 'base/run_all_unittests.cc', 'base/sdch_filter_unittest.cc', - 'base/server_bound_cert_service_unittest.cc', 'base/single_request_host_resolver_unittest.cc', - 'base/ssl_cipher_suite_names_unittest.cc', - 'base/ssl_client_auth_cache_unittest.cc', - 'base/ssl_config_service_unittest.cc', '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/transport_security_state_unittest.cc', 'base/unix_domain_socket_posix_unittest.cc', 'base/upload_bytes_element_reader_unittest.cc', 'base/upload_data_stream_unittest.cc', @@ -1511,6 +1504,7 @@ 'http/mock_http_cache.h', 'http/mock_sspi_library_win.cc', 'http/mock_sspi_library_win.h', + 'http/transport_security_state_unittest.cc', 'http/url_security_manager_unittest.cc', 'proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc', 'proxy/dhcp_proxy_script_fetcher_factory_unittest.cc', @@ -1646,6 +1640,12 @@ 'spdy/spdy_websocket_test_util_spdy2.h', 'spdy/spdy_websocket_test_util_spdy3.cc', 'spdy/spdy_websocket_test_util_spdy3.h', + 'ssl/client_cert_store_impl_unittest.cc', + 'ssl/default_server_bound_cert_store_unittest.cc', + 'ssl/server_bound_cert_service_unittest.cc', + 'ssl/ssl_cipher_suite_names_unittest.cc', + 'ssl/ssl_client_auth_cache_unittest.cc', + 'ssl/ssl_config_service_unittest.cc', 'test/python_utils_unittest.cc', 'tools/dump_cache/url_to_filename_encoder.cc', 'tools/dump_cache/url_to_filename_encoder.h', @@ -1689,7 +1689,7 @@ # No res_ninit() et al on Android, so this doesn't make a lot of # sense. 'dns/dns_config_service_posix_unittest.cc', - 'base/client_cert_store_impl_unittest.cc', + 'ssl/client_cert_store_impl_unittest.cc', ], 'dependencies': [ 'net_javatests', @@ -1738,9 +1738,9 @@ # TODO(bulach): Add equivalent tests when the underlying # functionality is ported to OpenSSL. 'sources!': [ - 'base/client_cert_store_impl_unittest.cc', 'base/nss_cert_database_unittest.cc', 'base/x509_util_nss_unittest.cc', + 'ssl/client_cert_store_impl_unittest.cc', ], }, { # else !use_openssl: remove the unneeded files 'sources!': [ @@ -1829,7 +1829,6 @@ 'sources!': [ # TODO(droger): The following tests are disabled because the # implementation is missing or incomplete. - 'base/client_cert_store_impl_unittest.cc', # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS. 'base/keygen_handler_unittest.cc', # Need to read input data files. @@ -1840,6 +1839,7 @@ # Need TestServer. 'proxy/proxy_script_fetcher_impl_unittest.cc', 'socket/ssl_client_socket_unittest.cc', + 'ssl/client_cert_store_impl_unittest.cc', 'url_request/url_fetcher_impl_unittest.cc', 'url_request/url_request_context_builder_unittest.cc', # Needs GetAppOutput(). @@ -1855,7 +1855,7 @@ 'sources!': [ # These sources can't be built with coverage due to a # toolchain bug: http://openradar.appspot.com/radar?id=1499403 - 'base/transport_security_state_unittest.cc', + 'http/transport_security_state_unittest.cc', # These tests crash when run with coverage turned on due to an # issue with llvm_gcda_increment_indirect_counter: diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index 1121ac6..e4ea2b9 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -14,12 +14,12 @@ #include "net/base/mock_cert_verifier.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/base/test_completion_callback.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/test/test_server.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_file_job.h" diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc index 10c1ad9..fc606d1 100644 --- a/net/quic/quic_network_transaction_unittest.cc +++ b/net/quic/quic_network_transaction_unittest.cc @@ -7,7 +7,6 @@ #include "base/memory/scoped_ptr.h" #include "net/base/mock_cert_verifier.h" #include "net/base/mock_host_resolver.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/base/test_completion_callback.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" @@ -32,6 +31,7 @@ #include "net/socket/ssl_client_socket.h" #include "net/spdy/spdy_frame_builder.h" #include "net/spdy/spdy_framer.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc index bd46652..95dcf2f 100644 --- a/net/socket/client_socket_pool_manager_impl.cc +++ b/net/socket/client_socket_pool_manager_impl.cc @@ -6,12 +6,12 @@ #include "base/logging.h" #include "base/values.h" -#include "net/base/ssl_config_service.h" -#include "net/http/http_proxy_client_socket_pool.h" #include "net/http/http_network_session.h" +#include "net/http/http_proxy_client_socket_pool.h" #include "net/socket/socks_client_socket_pool.h" #include "net/socket/ssl_client_socket_pool.h" #include "net/socket/transport_client_socket_pool.h" +#include "net/ssl/ssl_config_service.h" namespace net { diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index cca64bb..81dbbea 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -17,13 +17,13 @@ #include "net/base/address_list.h" #include "net/base/auth.h" #include "net/base/load_timing_info.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_info.h" #include "net/http/http_network_session.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/socket/client_socket_pool_histograms.h" #include "net/socket/socket.h" +#include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_info.h" #include "testing/gtest/include/gtest/gtest.h" // Socket events are easier to debug if you log individual reads and writes. diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index 89c7c81..4ee958e 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -21,7 +21,6 @@ #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service.h" #include "net/base/test_completion_callback.h" #include "net/http/http_auth_controller.h" #include "net/http/http_proxy_client_socket_pool.h" @@ -31,6 +30,7 @@ #include "net/socket/ssl_client_socket.h" #include "net/socket/ssl_client_socket_pool.h" #include "net/socket/transport_client_socket_pool.h" +#include "net/ssl/ssl_config_service.h" #include "net/udp/datagram_client_socket.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 44ba796..594237e 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -90,20 +90,20 @@ #include "net/base/cert_verifier.h" #include "net/base/connection_type_histograms.h" #include "net/base/dns_util.h" -#include "net/base/transport_security_state.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/ssl_cert_request_info.h" -#include "net/base/ssl_connection_status_flags.h" -#include "net/base/ssl_info.h" #include "net/base/x509_certificate_net_log_param.h" #include "net/base/x509_util.h" +#include "net/http/transport_security_state.h" #include "net/ocsp/nss_ocsp.h" #include "net/socket/client_socket_handle.h" #include "net/socket/nss_ssl_util.h" #include "net/socket/ssl_error_params.h" +#include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_connection_status_flags.h" +#include "net/ssl/ssl_info.h" #if defined(OS_WIN) #include <windows.h> diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h index 6f3f7bb..0ce7338 100644 --- a/net/socket/ssl_client_socket_nss.h +++ b/net/socket/ssl_client_socket_nss.h @@ -24,10 +24,10 @@ #include "net/base/net_export.h" #include "net/base/net_log.h" #include "net/base/nss_memio.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/ssl_config_service.h" #include "net/base/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" namespace base { class SequencedTaskRunner; diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 0f47b98..87a0c50 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -7,9 +7,9 @@ #include "net/socket/ssl_client_socket_openssl.h" -#include <openssl/ssl.h> #include <openssl/err.h> #include <openssl/opensslv.h> +#include <openssl/ssl.h> #include "base/bind.h" #include "base/callback_helpers.h" @@ -21,11 +21,11 @@ #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/ssl_cert_request_info.h" -#include "net/base/ssl_connection_status_flags.h" -#include "net/base/ssl_info.h" #include "net/base/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" +#include "net/ssl/ssl_info.h" namespace net { diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h index f756345..f54b265 100644 --- a/net/socket/ssl_client_socket_openssl.h +++ b/net/socket/ssl_client_socket_openssl.h @@ -12,9 +12,9 @@ #include "net/base/cert_verify_result.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" -#include "net/base/ssl_config_service.h" -#include "net/socket/ssl_client_socket.h" #include "net/socket/client_socket_handle.h" +#include "net/socket/ssl_client_socket.h" +#include "net/ssl/ssl_config_service.h" // Avoid including misc OpenSSL headers, i.e.: // <openssl/bio.h> diff --git a/net/socket/ssl_client_socket_openssl_unittest.cc b/net/socket/ssl_client_socket_openssl_unittest.cc index bee0389..85f5a0c 100644 --- a/net/socket/ssl_client_socket_openssl_unittest.cc +++ b/net/socket/ssl_client_socket_openssl_unittest.cc @@ -28,8 +28,6 @@ #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/openssl_client_key_store.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_config_service.h" #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" #include "net/base/test_root_certs.h" @@ -37,6 +35,8 @@ #include "net/socket/client_socket_handle.h" #include "net/socket/socket_test_util.h" #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/test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc index 898df6e..0f3da13 100644 --- a/net/socket/ssl_client_socket_pool.cc +++ b/net/socket/ssl_client_socket_pool.cc @@ -9,9 +9,8 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/values.h" -#include "net/base/net_errors.h" #include "net/base/host_port_pair.h" -#include "net/base/ssl_cert_request_info.h" +#include "net/base/net_errors.h" #include "net/http/http_proxy_client_socket.h" #include "net/http/http_proxy_client_socket_pool.h" #include "net/socket/client_socket_factory.h" @@ -19,6 +18,7 @@ #include "net/socket/socks_client_socket_pool.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/transport_client_socket_pool.h" +#include "net/ssl/ssl_cert_request_info.h" namespace net { diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h index 03f79dc..a0a5d3b 100644 --- a/net/socket/ssl_client_socket_pool.h +++ b/net/socket/ssl_client_socket_pool.h @@ -11,13 +11,13 @@ #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "net/base/host_resolver.h" -#include "net/base/ssl_config_service.h" #include "net/http/http_response_info.h" #include "net/proxy/proxy_server.h" -#include "net/socket/ssl_client_socket.h" +#include "net/socket/client_socket_pool.h" #include "net/socket/client_socket_pool_base.h" #include "net/socket/client_socket_pool_histograms.h" -#include "net/socket/client_socket_pool.h" +#include "net/socket/ssl_client_socket.h" +#include "net/ssl/ssl_config_service.h" namespace net { diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index 22b6ffa..6e31442 100644 --- a/net/socket/ssl_client_socket_pool_unittest.cc +++ b/net/socket/ssl_client_socket_pool_unittest.cc @@ -15,7 +15,6 @@ #include "net/base/load_timing_info_test_util.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/base/test_certificate_data.h" #include "net/base/test_completion_callback.h" #include "net/http/http_auth_handler_factory.h" @@ -30,6 +29,7 @@ #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_test_util_spdy2.h" +#include "net/ssl/ssl_config_service_defaults.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 da02cb5..3163077 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -14,8 +14,6 @@ #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_config_service.h" #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" #include "net/base/test_root_certs.h" @@ -23,6 +21,8 @@ #include "net/socket/client_socket_handle.h" #include "net/socket/socket_test_util.h" #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/test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h index bc4239a..a9197c1 100644 --- a/net/socket/ssl_server_socket_nss.h +++ b/net/socket/ssl_server_socket_nss.h @@ -15,8 +15,8 @@ #include "net/base/host_port_pair.h" #include "net/base/net_log.h" #include "net/base/nss_memio.h" -#include "net/base/ssl_config_service.h" #include "net/socket/ssl_server_socket.h" +#include "net/ssl/ssl_config_service.h" namespace net { diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index 1608b9f..817b912 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -36,14 +36,14 @@ #include "net/base/mock_cert_verifier.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service.h" -#include "net/base/ssl_info.h" #include "net/base/test_data_directory.h" #include "net/base/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 "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index aad8465..8838bd3 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -24,8 +24,6 @@ #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_info.h" #include "net/http/http_auth_controller.h" #include "net/http/http_network_session.h" #include "net/http/http_request_headers.h" @@ -40,6 +38,8 @@ #include "net/socket/ssl_client_socket.h" #include "net/socket/tcp_client_socket.h" #include "net/socket_stream/socket_stream_metrics.h" +#include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_info.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h index b1422b65e..ebe175a 100644 --- a/net/socket_stream/socket_stream.h +++ b/net/socket_stream/socket_stream.h @@ -18,8 +18,8 @@ #include "net/base/net_errors.h" #include "net/base/net_export.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/url_request.h" namespace net { diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc index 3bbb6b6..9c13a8f 100644 --- a/net/socket_stream/socket_stream_job.cc +++ b/net/socket_stream/socket_stream_job.cc @@ -5,9 +5,9 @@ #include "net/socket_stream/socket_stream_job.h" #include "base/memory/singleton.h" -#include "net/base/ssl_config_service.h" -#include "net/base/transport_security_state.h" +#include "net/http/transport_security_state.h" #include "net/socket_stream/socket_stream_job_manager.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/url_request_context.h" namespace net { diff --git a/net/spdy/spdy_credential_builder.cc b/net/spdy/spdy_credential_builder.cc index 8ddda97..88080d9 100644 --- a/net/spdy/spdy_credential_builder.cc +++ b/net/spdy/spdy_credential_builder.cc @@ -9,10 +9,10 @@ #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" #include "net/base/asn1_util.h" -#include "net/base/server_bound_cert_service.h" #include "net/base/net_errors.h" #include "net/socket/ssl_client_socket.h" #include "net/spdy/spdy_framer.h" +#include "net/ssl/server_bound_cert_service.h" namespace net { diff --git a/net/spdy/spdy_credential_builder.h b/net/spdy/spdy_credential_builder.h index 278d239..d74b600 100644 --- a/net/spdy/spdy_credential_builder.h +++ b/net/spdy/spdy_credential_builder.h @@ -8,7 +8,7 @@ #include <string> #include "net/base/net_export.h" -#include "net/base/ssl_client_cert_type.h" +#include "net/ssl/ssl_client_cert_type.h" namespace net { diff --git a/net/spdy/spdy_credential_builder_unittest.cc b/net/spdy/spdy_credential_builder_unittest.cc index c3feb59..1d83a63 100644 --- a/net/spdy/spdy_credential_builder_unittest.cc +++ b/net/spdy/spdy_credential_builder_unittest.cc @@ -5,12 +5,12 @@ #include "net/spdy/spdy_credential_builder.h" #include "base/threading/sequenced_worker_pool.h" -#include "crypto/ec_signature_creator.h" #include "crypto/ec_private_key.h" +#include "crypto/ec_signature_creator.h" #include "net/base/asn1_util.h" -#include "net/base/default_server_bound_cert_store.h" -#include "net/base/server_bound_cert_service.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" #include "testing/platform_test.h" using namespace net::test_spdy3; diff --git a/net/spdy/spdy_credential_state.cc b/net/spdy/spdy_credential_state.cc index 943d732..d8c99bf 100644 --- a/net/spdy/spdy_credential_state.cc +++ b/net/spdy/spdy_credential_state.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/string_util.h" -#include "net/base/server_bound_cert_service.h" +#include "net/ssl/server_bound_cert_service.h" namespace net { diff --git a/net/spdy/spdy_http_stream_spdy2_unittest.cc b/net/spdy/spdy_http_stream_spdy2_unittest.cc index fbb605e..31b23e4 100644 --- a/net/spdy/spdy_http_stream_spdy2_unittest.cc +++ b/net/spdy/spdy_http_stream_spdy2_unittest.cc @@ -9,7 +9,6 @@ #include "crypto/signature_creator.h" #include "net/base/asn1_util.h" #include "net/base/capturing_net_log.h" -#include "net/base/default_server_bound_cert_store.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/upload_data_stream.h" @@ -19,6 +18,7 @@ #include "net/http/http_response_info.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_test_util_spdy2.h" +#include "net/ssl/default_server_bound_cert_store.h" #include "testing/gtest/include/gtest/gtest.h" using namespace net::test_spdy2; diff --git a/net/spdy/spdy_http_stream_spdy3_unittest.cc b/net/spdy/spdy_http_stream_spdy3_unittest.cc index 7ede0d3..ae015e6 100644 --- a/net/spdy/spdy_http_stream_spdy3_unittest.cc +++ b/net/spdy/spdy_http_stream_spdy3_unittest.cc @@ -11,7 +11,6 @@ #include "crypto/signature_creator.h" #include "net/base/asn1_util.h" #include "net/base/capturing_net_log.h" -#include "net/base/default_server_bound_cert_store.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/upload_data_stream.h" @@ -23,6 +22,7 @@ #include "net/spdy/spdy_http_utils.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_test_util_spdy3.h" +#include "net/ssl/default_server_bound_cert_store.h" #include "testing/gtest/include/gtest/gtest.h" using namespace net::test_spdy3; diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 2fffbc9..c819ee8 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -28,7 +28,6 @@ #include "net/base/connection_type_histograms.h" #include "net/base/net_log.h" #include "net/base/net_util.h" -#include "net/base/server_bound_cert_service.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties.h" #include "net/spdy/spdy_credential_builder.h" @@ -37,6 +36,7 @@ #include "net/spdy/spdy_protocol.h" #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_stream.h" +#include "net/ssl/server_bound_cert_service.h" namespace net { diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index 51ed212..7900e9b 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_session.h @@ -20,8 +20,6 @@ #include "net/base/load_states.h" #include "net/base/net_errors.h" #include "net/base/request_priority.h" -#include "net/base/ssl_client_cert_type.h" -#include "net/base/ssl_config_service.h" #include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/stream_socket.h" @@ -31,6 +29,8 @@ #include "net/spdy/spdy_io_buffer.h" #include "net/spdy/spdy_protocol.h" #include "net/spdy/spdy_session_pool.h" +#include "net/ssl/ssl_client_cert_type.h" +#include "net/ssl/ssl_config_service.h" namespace net { diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h index fee6779..f10cc0f 100644 --- a/net/spdy/spdy_session_pool.h +++ b/net/spdy/spdy_session_pool.h @@ -5,8 +5,8 @@ #ifndef NET_SPDY_SPDY_SESSION_POOL_H_ #define NET_SPDY_SPDY_SESSION_POOL_H_ -#include <map> #include <list> +#include <map> #include <string> #include "base/basictypes.h" @@ -18,10 +18,10 @@ #include "net/base/net_errors.h" #include "net/base/net_export.h" #include "net/base/network_change_notifier.h" -#include "net/base/ssl_config_service.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_server.h" #include "net/socket/next_proto.h" +#include "net/ssl/ssl_config_service.h" namespace net { diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h index 1e3597c..2544fff 100644 --- a/net/spdy/spdy_stream.h +++ b/net/spdy/spdy_stream.h @@ -18,13 +18,13 @@ #include "net/base/net_export.h" #include "net/base/net_log.h" #include "net/base/request_priority.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/ssl_client_cert_type.h" #include "net/socket/ssl_client_socket.h" #include "net/spdy/spdy_framer.h" #include "net/spdy/spdy_header_block.h" #include "net/spdy/spdy_protocol.h" #include "net/spdy/spdy_session.h" +#include "net/ssl/server_bound_cert_service.h" +#include "net/ssl/ssl_client_cert_type.h" namespace net { diff --git a/net/spdy/spdy_test_util_spdy2.h b/net/spdy/spdy_test_util_spdy2.h index a4d0542..13b8017 100644 --- a/net/spdy/spdy_test_util_spdy2.h +++ b/net/spdy/spdy_test_util_spdy2.h @@ -10,16 +10,16 @@ #include "net/base/host_port_pair.h" #include "net/base/mock_host_resolver.h" #include "net/base/request_priority.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" -#include "net/http/http_network_session.h" #include "net/http/http_network_layer.h" +#include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" #include "net/http/http_transaction_factory.h" #include "net/proxy/proxy_service.h" #include "net/socket/socket_test_util.h" #include "net/spdy/spdy_session.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" diff --git a/net/spdy/spdy_test_util_spdy3.h b/net/spdy/spdy_test_util_spdy3.h index dfdf6af..a59b5e9 100644 --- a/net/spdy/spdy_test_util_spdy3.h +++ b/net/spdy/spdy_test_util_spdy3.h @@ -13,16 +13,16 @@ #include "net/base/host_port_pair.h" #include "net/base/mock_host_resolver.h" #include "net/base/request_priority.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" -#include "net/http/http_network_session.h" #include "net/http/http_network_layer.h" +#include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" #include "net/http/http_transaction_factory.h" #include "net/proxy/proxy_service.h" #include "net/socket/socket_test_util.h" #include "net/spdy/spdy_session.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" diff --git a/net/base/client_cert_store.h b/net/ssl/client_cert_store.h index e1a22dd..77ebe37 100644 --- a/net/base/client_cert_store.h +++ b/net/ssl/client_cert_store.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_CLIENT_CERT_STORE_H_ -#define NET_BASE_CLIENT_CERT_STORE_H_ +#ifndef NET_SSL_CLIENT_CERT_STORE_H_ +#define NET_SSL_CLIENT_CERT_STORE_H_ #include "base/basictypes.h" #include "net/base/net_export.h" @@ -28,4 +28,4 @@ class NET_EXPORT ClientCertStore { } // namespace net -#endif // NET_BASE_CLIENT_CERT_STORE_H_ +#endif // NET_SSL_CLIENT_CERT_STORE_H_ diff --git a/net/base/client_cert_store_impl.h b/net/ssl/client_cert_store_impl.h index 3b08b29..81b68df 100644 --- a/net/base/client_cert_store_impl.h +++ b/net/ssl/client_cert_store_impl.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_CLIENT_CERT_STORE_IMPL_H_ -#define NET_BASE_CLIENT_CERT_STORE_IMPL_H_ +#ifndef NET_SSL_CLIENT_CERT_STORE_IMPL_H_ +#define NET_SSL_CLIENT_CERT_STORE_IMPL_H_ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "net/base/client_cert_store.h" #include "net/base/net_export.h" -#include "net/base/ssl_cert_request_info.h" +#include "net/ssl/client_cert_store.h" +#include "net/ssl/ssl_cert_request_info.h" namespace net { @@ -61,4 +61,4 @@ class NET_EXPORT ClientCertStoreImpl : public ClientCertStore { } // namespace net -#endif // NET_BASE_CLIENT_CERT_STORE_IMPL_H_ +#endif // NET_SSL_CLIENT_CERT_STORE_IMPL_H_ diff --git a/net/base/client_cert_store_impl_mac.cc b/net/ssl/client_cert_store_impl_mac.cc index 80a9210..43cd92b 100644 --- a/net/base/client_cert_store_impl_mac.cc +++ b/net/ssl/client_cert_store_impl_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/client_cert_store_impl.h" +#include "net/ssl/client_cert_store_impl.h" #include <CommonCrypto/CommonDigest.h> #include <CoreFoundation/CFArray.h> diff --git a/net/base/client_cert_store_impl_nss.cc b/net/ssl/client_cert_store_impl_nss.cc index 0cb89ce..bca8ea5 100644 --- a/net/base/client_cert_store_impl_nss.cc +++ b/net/ssl/client_cert_store_impl_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/client_cert_store_impl.h" +#include "net/ssl/client_cert_store_impl.h" #include <nss.h> #include <ssl.h> diff --git a/net/base/client_cert_store_impl_unittest.cc b/net/ssl/client_cert_store_impl_unittest.cc index fb2de79..63ea02d 100644 --- a/net/base/client_cert_store_impl_unittest.cc +++ b/net/ssl/client_cert_store_impl_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/client_cert_store_impl.h" +#include "net/ssl/client_cert_store_impl.h" #include <string> #include <vector> diff --git a/net/base/client_cert_store_impl_win.cc b/net/ssl/client_cert_store_impl_win.cc index 9098076..7dbe1f0 100644 --- a/net/base/client_cert_store_impl_win.cc +++ b/net/ssl/client_cert_store_impl_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/client_cert_store_impl.h" +#include "net/ssl/client_cert_store_impl.h" #include <algorithm> #include <string> diff --git a/net/base/default_server_bound_cert_store.cc b/net/ssl/default_server_bound_cert_store.cc index 731f99c..eb4c0e3 100644 --- a/net/base/default_server_bound_cert_store.cc +++ b/net/ssl/default_server_bound_cert_store.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/default_server_bound_cert_store.h" +#include "net/ssl/default_server_bound_cert_store.h" #include "base/bind.h" #include "base/message_loop.h" diff --git a/net/base/default_server_bound_cert_store.h b/net/ssl/default_server_bound_cert_store.h index f26478b..a932959 100644 --- a/net/base/default_server_bound_cert_store.h +++ b/net/ssl/default_server_bound_cert_store.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_DEFAULT_SERVER_BOUND_CERT_STORE_H_ -#define NET_BASE_DEFAULT_SERVER_BOUND_CERT_STORE_H_ +#ifndef NET_SSL_DEFAULT_SERVER_BOUND_CERT_STORE_H_ +#define NET_SSL_DEFAULT_SERVER_BOUND_CERT_STORE_H_ #include <map> #include <string> @@ -16,7 +16,7 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "net/base/net_export.h" -#include "net/base/server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_store.h" namespace net { @@ -192,4 +192,4 @@ class NET_EXPORT DefaultServerBoundCertStore::PersistentStore } // namespace net -#endif // NET_DEFAULT_ORIGIN_BOUND_CERT_STORE_H_ +#endif // NET_SSL_DEFAULT_SERVER_BOUND_CERT_STORE_H_ diff --git a/net/base/default_server_bound_cert_store_unittest.cc b/net/ssl/default_server_bound_cert_store_unittest.cc index e1d2d5e..d52d286 100644 --- a/net/base/default_server_bound_cert_store_unittest.cc +++ b/net/ssl/default_server_bound_cert_store_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/default_server_bound_cert_store.h" +#include "net/ssl/default_server_bound_cert_store.h" #include <map> #include <string> diff --git a/net/base/server_bound_cert_service.cc b/net/ssl/server_bound_cert_service.cc index e6c5166..ece1a2c 100644 --- a/net/base/server_bound_cert_service.cc +++ b/net/ssl/server_bound_cert_service.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/server_bound_cert_service.h" +#include "net/ssl/server_bound_cert_service.h" #include <algorithm> #include <limits> diff --git a/net/base/server_bound_cert_service.h b/net/ssl/server_bound_cert_service.h index 151b279..734199e 100644 --- a/net/base/server_bound_cert_service.h +++ b/net/ssl/server_bound_cert_service.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_SERVER_BOUND_CERT_SERVICE_H_ -#define NET_BASE_SERVER_BOUND_CERT_SERVICE_H_ +#ifndef NET_SSL_SERVER_BOUND_CERT_SERVICE_H_ +#define NET_SSL_SERVER_BOUND_CERT_SERVICE_H_ #include <map> #include <string> @@ -16,8 +16,8 @@ #include "base/time.h" #include "net/base/completion_callback.h" #include "net/base/net_export.h" -#include "net/base/server_bound_cert_store.h" -#include "net/base/ssl_client_cert_type.h" +#include "net/ssl/server_bound_cert_store.h" +#include "net/ssl/ssl_client_cert_type.h" namespace base { class TaskRunner; @@ -162,4 +162,4 @@ class NET_EXPORT ServerBoundCertService } // namespace net -#endif // NET_BASE_SERVER_BOUND_CERT_SERVICE_H_ +#endif // NET_SSL_SERVER_BOUND_CERT_SERVICE_H_ diff --git a/net/base/server_bound_cert_service_unittest.cc b/net/ssl/server_bound_cert_service_unittest.cc index 9e505db..4d0c6f4 100644 --- a/net/base/server_bound_cert_service_unittest.cc +++ b/net/ssl/server_bound_cert_service_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/server_bound_cert_service.h" +#include "net/ssl/server_bound_cert_service.h" #include <string> #include <vector> @@ -13,10 +13,10 @@ #include "base/threading/sequenced_worker_pool.h" #include "crypto/ec_private_key.h" #include "net/base/asn1_util.h" -#include "net/base/default_server_bound_cert_store.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/base/x509_certificate.h" +#include "net/ssl/default_server_bound_cert_store.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/server_bound_cert_store.cc b/net/ssl/server_bound_cert_store.cc index f5ca047..d0d520d 100644 --- a/net/base/server_bound_cert_store.cc +++ b/net/ssl/server_bound_cert_store.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/server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_store.h" namespace net { diff --git a/net/base/server_bound_cert_store.h b/net/ssl/server_bound_cert_store.h index 85e1035..21cac7e 100644 --- a/net/base/server_bound_cert_store.h +++ b/net/ssl/server_bound_cert_store.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_SERVER_BOUND_CERT_STORE_H_ -#define NET_BASE_SERVER_BOUND_CERT_STORE_H_ +#ifndef NET_SSL_SERVER_BOUND_CERT_STORE_H_ +#define NET_SSL_SERVER_BOUND_CERT_STORE_H_ #include <list> #include <string> @@ -12,7 +12,7 @@ #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "net/base/net_export.h" -#include "net/base/ssl_client_cert_type.h" +#include "net/ssl/ssl_client_cert_type.h" namespace net { @@ -135,4 +135,4 @@ class NET_EXPORT ServerBoundCertStore } // namespace net -#endif // NET_BASE_SERVER_BOUND_CERT_STORE_H_ +#endif // NET_SSL_SERVER_BOUND_CERT_STORE_H_ diff --git a/net/base/ssl_cert_request_info.cc b/net/ssl/ssl_cert_request_info.cc index 3f9055f..98d1f76 100644 --- a/net/base/ssl_cert_request_info.cc +++ b/net/ssl/ssl_cert_request_info.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/ssl_cert_request_info.h" +#include "net/ssl/ssl_cert_request_info.h" #include "net/base/x509_certificate.h" diff --git a/net/base/ssl_cert_request_info.h b/net/ssl/ssl_cert_request_info.h index e9e64de..fecffb8 100644 --- a/net/base/ssl_cert_request_info.h +++ b/net/ssl/ssl_cert_request_info.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_SSL_CERT_REQUEST_INFO_H_ -#define NET_BASE_SSL_CERT_REQUEST_INFO_H_ +#ifndef NET_SSL_SSL_CERT_REQUEST_INFO_H_ +#define NET_SSL_SSL_CERT_REQUEST_INFO_H_ #include <string> #include <vector> #include "base/memory/ref_counted.h" #include "net/base/net_export.h" -#include "net/base/ssl_client_cert_type.h" +#include "net/ssl/ssl_client_cert_type.h" namespace net { @@ -65,4 +65,4 @@ class NET_EXPORT SSLCertRequestInfo } // namespace net -#endif // NET_BASE_SSL_CERT_REQUEST_INFO_H_ +#endif // NET_SSL_SSL_CERT_REQUEST_INFO_H_ diff --git a/net/base/ssl_cipher_suite_names.cc b/net/ssl/ssl_cipher_suite_names.cc index dec50b8..c07d5c2 100644 --- a/net/base/ssl_cipher_suite_names.cc +++ b/net/ssl/ssl_cipher_suite_names.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/ssl_cipher_suite_names.h" +#include "net/ssl/ssl_cipher_suite_names.h" #include <stdlib.h> #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "net/base/ssl_connection_status_flags.h" +#include "net/ssl/ssl_connection_status_flags.h" // Rather than storing the names of all the ciphersuites we eliminate the // redundancy and break each cipher suite into a key exchange method, cipher diff --git a/net/base/ssl_cipher_suite_names.h b/net/ssl/ssl_cipher_suite_names.h index 576b564..cef10b2 100644 --- a/net/base/ssl_cipher_suite_names.h +++ b/net/ssl/ssl_cipher_suite_names.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_SSL_CIPHER_SUITE_NAMES_H_ -#define NET_BASE_SSL_CIPHER_SUITE_NAMES_H_ +#ifndef NET_SSL_SSL_CIPHER_SUITE_NAMES_H_ +#define NET_SSL_SSL_CIPHER_SUITE_NAMES_H_ #include <string> @@ -25,7 +25,7 @@ NET_EXPORT void SSLCipherSuiteToStrings(const char** key_exchange_str, // SSLVersionToString returns the name of the SSL protocol version // specified by |ssl_version|, which is defined in -// net/base/ssl_connection_status_flags.h. +// net/ssl/ssl_connection_status_flags.h. // If the version is unknown, |name| is set to "???". NET_EXPORT void SSLVersionToString(const char** name, int ssl_version); @@ -46,4 +46,4 @@ NET_EXPORT bool ParseSSLCipherString(const std::string& cipher_string, } // namespace net -#endif // NET_BASE_SSL_CIPHER_SUITE_NAMES_H_ +#endif // NET_SSL_SSL_CIPHER_SUITE_NAMES_H_ diff --git a/net/base/ssl_cipher_suite_names_unittest.cc b/net/ssl/ssl_cipher_suite_names_unittest.cc index 03ceef6..50bf1da 100644 --- a/net/base/ssl_cipher_suite_names_unittest.cc +++ b/net/ssl/ssl_cipher_suite_names_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/ssl_cipher_suite_names.h" +#include "net/ssl/ssl_cipher_suite_names.h" #include "base/basictypes.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/ssl_client_auth_cache.cc b/net/ssl/ssl_client_auth_cache.cc index f5e5e91..9fb9e4f 100644 --- a/net/base/ssl_client_auth_cache.cc +++ b/net/ssl/ssl_client_auth_cache.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/ssl_client_auth_cache.h" +#include "net/ssl/ssl_client_auth_cache.h" #include "base/logging.h" #include "net/base/x509_certificate.h" diff --git a/net/base/ssl_client_auth_cache.h b/net/ssl/ssl_client_auth_cache.h index f8175d2..742d0f3 100644 --- a/net/base/ssl_client_auth_cache.h +++ b/net/ssl/ssl_client_auth_cache.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_SSL_CLIENT_AUTH_CACHE_H_ -#define NET_BASE_SSL_CLIENT_AUTH_CACHE_H_ +#ifndef NET_SSL_SSL_CLIENT_AUTH_CACHE_H_ +#define NET_SSL_SSL_CLIENT_AUTH_CACHE_H_ -#include <string> #include <map> +#include <string> #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" @@ -60,4 +60,4 @@ class NET_EXPORT_PRIVATE SSLClientAuthCache : public CertDatabase::Observer { } // namespace net -#endif // NET_BASE_SSL_CLIENT_AUTH_CACHE_H_ +#endif // NET_SSL_SSL_CLIENT_AUTH_CACHE_H_ diff --git a/net/base/ssl_client_auth_cache_unittest.cc b/net/ssl/ssl_client_auth_cache_unittest.cc index 29ede5be..9a5c5c0 100644 --- a/net/base/ssl_client_auth_cache_unittest.cc +++ b/net/ssl/ssl_client_auth_cache_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/ssl_client_auth_cache.h" +#include "net/ssl/ssl_client_auth_cache.h" #include "base/time.h" #include "net/base/x509_certificate.h" diff --git a/net/base/ssl_client_cert_type.h b/net/ssl/ssl_client_cert_type.h index 5890f5f..dd6e997 100644 --- a/net/base/ssl_client_cert_type.h +++ b/net/ssl/ssl_client_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_SSL_CLIENT_CERT_TYPE_H_ -#define NET_BASE_SSL_CLIENT_CERT_TYPE_H_ +#ifndef NET_SSL_SSL_CLIENT_CERT_TYPE_H_ +#define NET_SSL_SSL_CLIENT_CERT_TYPE_H_ namespace net { @@ -19,4 +19,4 @@ enum SSLClientCertType { } // namespace net -#endif // NET_BASE_SSL_CLIENT_CERT_TYPE_H_ +#endif // NET_SSL_SSL_CLIENT_CERT_TYPE_H_ diff --git a/net/base/ssl_config_service.cc b/net/ssl/ssl_config_service.cc index 7dfe05e..829e101 100644 --- a/net/base/ssl_config_service.cc +++ b/net/ssl/ssl_config_service.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/ssl_config_service.h" +#include "net/ssl/ssl_config_service.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "net/base/crl_set.h" -#include "net/base/ssl_config_service_defaults.h" +#include "net/ssl/ssl_config_service_defaults.h" #if defined(USE_OPENSSL) #include <openssl/ssl.h> diff --git a/net/base/ssl_config_service.h b/net/ssl/ssl_config_service.h index e87b633..5206584 100644 --- a/net/base/ssl_config_service.h +++ b/net/ssl/ssl_config_service.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_SSL_CONFIG_SERVICE_H_ -#define NET_BASE_SSL_CONFIG_SERVICE_H_ +#ifndef NET_SSL_SSL_CONFIG_SERVICE_H_ +#define NET_SSL_SSL_CONFIG_SERVICE_H_ #include <vector> @@ -211,4 +211,4 @@ class NET_EXPORT SSLConfigService } // namespace net -#endif // NET_BASE_SSL_CONFIG_SERVICE_H_ +#endif // NET_SSL_SSL_CONFIG_SERVICE_H_ diff --git a/net/base/ssl_config_service_defaults.cc b/net/ssl/ssl_config_service_defaults.cc index c4c7e55..1d96977 100644 --- a/net/base/ssl_config_service_defaults.cc +++ b/net/ssl/ssl_config_service_defaults.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/ssl_config_service_defaults.h" +#include "net/ssl/ssl_config_service_defaults.h" namespace net { diff --git a/net/base/ssl_config_service_defaults.h b/net/ssl/ssl_config_service_defaults.h index 7987874..85123da 100644 --- a/net/base/ssl_config_service_defaults.h +++ b/net/ssl/ssl_config_service_defaults.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_SSL_CONFIG_SERVICE_DEFAULTS_H_ -#define NET_BASE_SSL_CONFIG_SERVICE_DEFAULTS_H_ +#ifndef NET_SSL_SSL_CONFIG_SERVICE_DEFAULTS_H_ +#define NET_SSL_SSL_CONFIG_SERVICE_DEFAULTS_H_ #include "net/base/net_export.h" -#include "net/base/ssl_config_service.h" +#include "net/ssl/ssl_config_service.h" namespace net { @@ -31,4 +31,4 @@ class NET_EXPORT SSLConfigServiceDefaults : public SSLConfigService { } // namespace net -#endif // NET_BASE_SSL_CONFIG_SERVICE_DEFAULTS_H_ +#endif // NET_SSL_SSL_CONFIG_SERVICE_DEFAULTS_H_ diff --git a/net/base/ssl_config_service_unittest.cc b/net/ssl/ssl_config_service_unittest.cc index a0d85db..e8a4c33 100644 --- a/net/base/ssl_config_service_unittest.cc +++ b/net/ssl/ssl_config_service_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/ssl_config_service.h" +#include "net/ssl/ssl_config_service.h" #include <vector> diff --git a/net/base/ssl_connection_status_flags.h b/net/ssl/ssl_connection_status_flags.h index 8132814..08d585f 100644 --- a/net/base/ssl_connection_status_flags.h +++ b/net/ssl/ssl_connection_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_SSL_CONNECTION_STATUS_FLAGS_H_ -#define NET_BASE_SSL_CONNECTION_STATUS_FLAGS_H_ +#ifndef NET_SSL_SSL_CONNECTION_STATUS_FLAGS_H_ +#define NET_SSL_SSL_CONNECTION_STATUS_FLAGS_H_ namespace net { @@ -60,4 +60,4 @@ inline int SSLConnectionStatusToVersion(int connection_status) { } // namespace net -#endif // NET_BASE_SSL_CONNECTION_STATUS_FLAGS_H_ +#endif // NET_SSL_SSL_CONNECTION_STATUS_FLAGS_H_ diff --git a/net/base/ssl_info.cc b/net/ssl/ssl_info.cc index 05882d3..b147966 100644 --- a/net/base/ssl_info.cc +++ b/net/ssl/ssl_info.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/ssl_info.h" +#include "net/ssl/ssl_info.h" #include "net/base/cert_status_flags.h" #include "net/base/x509_certificate.h" diff --git a/net/base/ssl_info.h b/net/ssl/ssl_info.h index 25019a26..32ac069 100644 --- a/net/base/ssl_info.h +++ b/net/ssl/ssl_info.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_SSL_INFO_H_ -#define NET_BASE_SSL_INFO_H_ +#ifndef NET_SSL_SSL_INFO_H_ +#define NET_SSL_SSL_INFO_H_ #include <vector> @@ -78,4 +78,4 @@ class NET_EXPORT SSLInfo { } // namespace net -#endif // NET_BASE_SSL_INFO_H_ +#endif // NET_SSL_SSL_INFO_H_ diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc index cfb86ab..950c9f3 100644 --- a/net/tools/fetch/fetch_client.cc +++ b/net/tools/fetch/fetch_client.cc @@ -18,7 +18,6 @@ #include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" @@ -27,6 +26,7 @@ #include "net/http/http_server_properties_impl.h" #include "net/http/http_transaction.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service_defaults.h" void usage(const char* program_name) { printf("usage: %s --url=<url> [--n=<clients>] [--stats] [--use_cache]\n", diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 5d3e26b..9eb2b4a 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -23,10 +23,10 @@ #include "net/base/net_log.h" #include "net/base/network_change_notifier.h" #include "net/base/network_delegate.h" -#include "net/base/ssl_cert_request_info.h" #include "net/base/upload_data_stream.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" +#include "net/ssl/ssl_cert_request_info.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_error_job.h" #include "net/url_request/url_request_job.h" diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h index 00e8ea6..1476d87 100644 --- a/net/url_request/url_request_context.h +++ b/net/url_request/url_request_context.h @@ -19,11 +19,11 @@ #include "base/threading/non_thread_safe.h" #include "net/base/net_export.h" #include "net/base/net_log.h" -#include "net/base/ssl_config_service.h" -#include "net/base/transport_security_state.h" +#include "net/ftp/ftp_auth_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties.h" -#include "net/ftp/ftp_auth_cache.h" +#include "net/http/transport_security_state.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/url_request.h" namespace net { diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index 97c3cf2..c82729f 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc @@ -10,14 +10,12 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/threading/thread.h" #include "base/thread_task_runner_handle.h" +#include "base/threading/thread.h" #include "net/base/cert_verifier.h" #include "net/base/host_resolver.h" #include "net/base/net_errors.h" #include "net/base/network_delegate.h" -#include "net/base/ssl_config_service_defaults.h" -#include "net/base/transport_security_state.h" #include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" @@ -25,7 +23,9 @@ #include "net/http/http_network_layer.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" +#include "net/http/transport_security_state.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc index cc57078..e201b8e 100644 --- a/net/url_request/url_request_context_storage.cc +++ b/net/url_request/url_request_context_storage.cc @@ -9,13 +9,13 @@ #include "net/base/host_resolver.h" #include "net/base/net_log.h" #include "net/base/network_delegate.h" -#include "net/base/server_bound_cert_service.h" #include "net/cookies/cookie_store.h" #include "net/ftp/ftp_transaction_factory.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_server_properties.h" #include "net/http/http_transaction_factory.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/server_bound_cert_service.h" #include "net/url_request/fraudulent_certificate_reporter.h" #include "net/url_request/http_user_agent_settings.h" #include "net/url_request/url_request_context.h" diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index caf344c..ba4f109 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -26,8 +26,6 @@ #include "net/base/net_util.h" #include "net/base/network_delegate.h" #include "net/base/sdch_manager.h" -#include "net/base/ssl_cert_request_info.h" -#include "net/base/ssl_config_service.h" #include "net/cookies/cookie_monster.h" #include "net/http/http_network_session.h" #include "net/http/http_request_headers.h" @@ -38,6 +36,8 @@ #include "net/http/http_transaction_delegate.h" #include "net/http/http_transaction_factory.h" #include "net/http/http_util.h" +#include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/fraudulent_certificate_reporter.h" #include "net/url_request/http_user_agent_settings.h" #include "net/url_request/url_request.h" diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc index a97d39f..dd01308 100644 --- a/net/url_request/url_request_test_util.cc +++ b/net/url_request/url_request_test_util.cc @@ -10,12 +10,12 @@ #include "base/threading/thread.h" #include "base/threading/worker_pool.h" #include "net/base/cert_verifier.h" -#include "net/base/default_server_bound_cert_store.h" #include "net/base/host_port_pair.h" #include "net/base/mock_host_resolver.h" -#include "net/base/server_bound_cert_service.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" +#include "net/ssl/default_server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_service.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request_job_factory_impl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h index 3986d52..c412823 100644 --- a/net/url_request/url_request_test_util.h +++ b/net/url_request/url_request_test_util.h @@ -26,7 +26,6 @@ #include "net/base/load_timing_info.h" #include "net/base/net_errors.h" #include "net/base/network_delegate.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" #include "net/ftp/ftp_network_layer.h" @@ -34,6 +33,7 @@ #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service_defaults.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/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 8ef10a8..c1de731 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -39,7 +39,6 @@ #include "net/base/net_log_unittest.h" #include "net/base/net_module.h" #include "net/base/net_util.h" -#include "net/base/ssl_connection_status_flags.h" #include "net/base/test_data_directory.h" #include "net/base/test_root_certs.h" #include "net/base/upload_bytes_element_reader.h" @@ -57,6 +56,7 @@ #include "net/ocsp/nss_ocsp.h" #include "net/proxy/proxy_service.h" #include "net/socket/ssl_client_socket.h" +#include "net/ssl/ssl_connection_status_flags.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/net/websockets/websocket_job_spdy2_unittest.cc b/net/websockets/websocket_job_spdy2_unittest.cc index a33ad92..3c4eb3d 100644 --- a/net/websockets/websocket_job_spdy2_unittest.cc +++ b/net/websockets/websocket_job_spdy2_unittest.cc @@ -17,18 +17,18 @@ #include "net/base/completion_callback.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" -#include "net/base/ssl_config_service.h" #include "net/base/test_completion_callback.h" -#include "net/base/transport_security_state.h" #include "net/cookies/cookie_store.h" #include "net/cookies/cookie_store_test_helpers.h" #include "net/http/http_transaction_factory.h" +#include "net/http/transport_security_state.h" #include "net/proxy/proxy_service.h" #include "net/socket/socket_test_util.h" #include "net/socket_stream/socket_stream.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_test_util_spdy2.h" #include "net/spdy/spdy_websocket_test_util_spdy2.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/url_request_context.h" #include "net/websockets/websocket_throttle.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/net/websockets/websocket_job_spdy3_unittest.cc b/net/websockets/websocket_job_spdy3_unittest.cc index 80b2553..740fef6 100644 --- a/net/websockets/websocket_job_spdy3_unittest.cc +++ b/net/websockets/websocket_job_spdy3_unittest.cc @@ -17,18 +17,18 @@ #include "net/base/completion_callback.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" -#include "net/base/ssl_config_service.h" #include "net/base/test_completion_callback.h" -#include "net/base/transport_security_state.h" #include "net/cookies/cookie_store.h" #include "net/cookies/cookie_store_test_helpers.h" #include "net/http/http_transaction_factory.h" +#include "net/http/transport_security_state.h" #include "net/proxy/proxy_service.h" #include "net/socket/socket_test_util.h" #include "net/socket_stream/socket_stream.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_test_util_spdy3.h" #include "net/spdy/spdy_websocket_test_util_spdy3.h" +#include "net/ssl/ssl_config_service.h" #include "net/url_request/url_request_context.h" #include "net/websockets/websocket_throttle.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/host/DEPS b/remoting/host/DEPS index 5cfd1e5..2f1aa54 100644 --- a/remoting/host/DEPS +++ b/remoting/host/DEPS @@ -4,6 +4,7 @@ include_rules = [ "+net/ftp", "+net/http", "+net/proxy", + "+net/ssl", "+net/test", "+net/url_request", diff --git a/remoting/host/url_request_context.cc b/remoting/host/url_request_context.cc index 6563939..aceccdb 100644 --- a/remoting/host/url_request_context.cc +++ b/remoting/host/url_request_context.cc @@ -7,14 +7,14 @@ #include "base/message_loop_proxy.h" #include "net/base/cert_verifier.h" #include "net/base/host_resolver.h" -#include "net/base/ssl_config_service_defaults.h" -#include "net/base/transport_security_state.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_layer.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" +#include "net/http/transport_security_state.h" #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "remoting/host/vlog_net_log.h" #if defined(OS_WIN) diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.cc b/remoting/protocol/ssl_hmac_channel_authenticator.cc index 6285d57..5643430 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator.cc @@ -11,11 +11,11 @@ #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/ssl_config_service.h" #include "net/base/x509_certificate.h" #include "net/socket/client_socket_factory.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/ssl_server_socket.h" +#include "net/ssl/ssl_config_service.h" #include "remoting/base/rsa_key_pair.h" #include "remoting/protocol/auth_util.h" diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index d973093..c773168 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -24,7 +24,7 @@ #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" #include "net/base/network_change_notifier.h" -#include "net/base/transport_security_state.h" +#include "net/http/transport_security_state.h" #include "net/url_request/url_request_test_util.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/base_node.h" diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index 9e958ca..c863df3 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -19,15 +19,15 @@ #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" #include "net/base/network_change_notifier.h" -#include "net/base/transport_security_state.h" +#include "net/http/transport_security_state.h" #include "net/url_request/url_request_test_util.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/base/model_type_invalidation_map.h" -#include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/invalidation_handler.h" +#include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/invalidation_util.h" -#include "sync/notifier/invalidator_factory.h" #include "sync/notifier/invalidator.h" +#include "sync/notifier/invalidator_factory.h" #include "sync/tools/null_invalidation_state_tracker.h" #if defined(OS_MACOSX) diff --git a/webkit/DEPS b/webkit/DEPS index f33a73d..b760178 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -43,6 +43,7 @@ include_rules = [ "+net/ftp", "+net/http", "+net/proxy", + "+net/ssl", "+net/socket", "+net/socket_stream", "+net/test", diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index fd07b3b..c0d0207 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -11,10 +11,7 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/worker_pool.h" #include "net/base/cert_verifier.h" -#include "net/base/default_server_bound_cert_store.h" #include "net/base/host_resolver.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/cookies/cookie_monster.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" @@ -23,6 +20,9 @@ #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/default_server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/http_user_agent_settings.h" #include "net/url_request/url_request_job_factory_impl.h" #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" |