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 /jingle | |
| 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 'jingle')
| -rw-r--r-- | jingle/glue/chrome_async_socket.cc | 4 | ||||
| -rw-r--r-- | jingle/glue/chrome_async_socket_unittest.cc | 2 | ||||
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.h | 2 | ||||
| -rw-r--r-- | jingle/glue/xmpp_client_socket_factory.h | 2 | ||||
| -rw-r--r-- | jingle/notifier/base/xmpp_connection.cc | 2 |
5 files changed, 6 insertions, 6 deletions
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" |