summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 17:41:57 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 17:41:57 +0000
commit536fd0b69edf4b73f057fe9c79f15beddd239ef8 (patch)
tree99ef55ba067df92fde47b22c03bc120c7bcf71d3 /remoting/protocol
parent01b9f9aca9bb152b809c0310dd439c7cb4fdc87c (diff)
downloadchromium_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 'remoting/protocol')
-rw-r--r--remoting/protocol/ssl_hmac_channel_authenticator.cc2
1 files changed, 1 insertions, 1 deletions
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"