summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_layer.cc
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 03:58:46 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 03:58:46 +0000
commit8e3c78cb4857505329f602e6af71a46d05346e99 (patch)
tree0f42439dbfdea47be8189bc39d682062d071d3ec /net/http/http_network_layer.cc
parent9822df966d60c67faaf4c4adacc70801aed9edaf (diff)
downloadchromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.zip
chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.gz
chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.bz2
Move NextProto enum to a new file net/socket/next_proto.h
BUG=120890 Review URL: http://codereview.chromium.org/9959033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_layer.cc')
-rw-r--r--net/http/http_network_layer.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 6afadea..9bb5c92 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -65,11 +65,11 @@ void HttpNetworkLayer::EnableSpdy(const std::string& mode) {
if (option == kOff) {
HttpStreamFactory::set_spdy_enabled(false);
} else if (option == kDisableSSL) {
- SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY2);
+ SpdySession::set_default_protocol(kProtoSPDY2);
HttpStreamFactory::set_force_spdy_over_ssl(false);
HttpStreamFactory::set_force_spdy_always(true);
} else if (option == kSSL) {
- SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY2);
+ SpdySession::set_default_protocol(kProtoSPDY2);
HttpStreamFactory::set_force_spdy_over_ssl(true);
HttpStreamFactory::set_force_spdy_always(true);
} else if (option == kDisablePing) {