diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 17:41:57 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 17:41:57 +0000 |
| commit | 536fd0b69edf4b73f057fe9c79f15beddd239ef8 (patch) | |
| tree | 99ef55ba067df92fde47b22c03bc120c7bcf71d3 /chrome/service/net | |
| parent | 01b9f9aca9bb152b809c0310dd439c7cb4fdc87c (diff) | |
| download | chromium_src-536fd0b69edf4b73f057fe9c79f15beddd239ef8.zip chromium_src-536fd0b69edf4b73f057fe9c79f15beddd239ef8.tar.gz chromium_src-536fd0b69edf4b73f057fe9c79f15beddd239ef8.tar.bz2 | |
net: split net/ssl out of net/base
Also moves transport_security_state files to net/http.
This change also updates the callers.
R=wtc
TBR=rsleevi,lambroslambrou,tony
BUG=70818
Review URL: https://codereview.chromium.org/12680003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/net')
| -rw-r--r-- | chrome/service/net/service_url_request_context.cc | 2 | ||||
| -rw-r--r-- | chrome/service/net/service_url_request_context.h | 2 |
2 files changed, 2 insertions, 2 deletions
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" |