Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_layer.cc

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unwrap short lines. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/base/next_proto.h ('K') | « net/base/next_proto.h ('k') | net/http/http_network_transaction_spdy21_unittest.cc » ('j') | net/socket/socket_test_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_layer.cc
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 0ae03d25d161667dd15df0d26c4b567f4235b083..5249882d13cf87cebc9940d8574b8cde556b208f 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -77,11 +77,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) {
« net/base/next_proto.h ('K') | « net/base/next_proto.h ('k') | net/http/http_network_transaction_spdy21_unittest.cc » ('j') | net/socket/socket_test_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698