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 /content/browser/loader/resource_loader.cc | |
| 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 'content/browser/loader/resource_loader.cc')
| -rw-r--r-- | content/browser/loader/resource_loader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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; |