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 /net/socket_stream | |
| 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 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 4 | ||||
| -rw-r--r-- | net/socket_stream/socket_stream.h | 2 | ||||
| -rw-r--r-- | net/socket_stream/socket_stream_job.cc | 4 |
3 files changed, 5 insertions, 5 deletions
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 { |