Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index a72e5f3f5ec17669cbf5485a120aa0c9c6864f6d..a9d4a3e7d0bf451306fbcec8e2df6335934e878b 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -732,8 +732,8 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) { |
net::HttpStreamFactory::EnableNpnSpdy4a2(); |
} else if (command_line.HasSwitch(switches::kDisableSpdy31)) { |
net::HttpStreamFactory::EnableNpnSpdy3(); |
- } else if (command_line.HasSwitch(switches::kEnableNpn)) { |
- net::HttpStreamFactory::EnableNpnSpdy(); |
+ } else if (command_line.HasSwitch(switches::kEnableSpdy2)) { |
+ net::HttpStreamFactory::EnableNpnSpdy31WithSpdy2(); |
} else if (command_line.HasSwitch(switches::kEnableNpnHttpOnly)) { |
net::HttpStreamFactory::EnableNpnHttpOnly(); |
} else { |
@@ -784,11 +784,11 @@ void IOThread::EnableSpdy(const std::string& mode) { |
if (option == kOff) { |
net::HttpStreamFactory::set_spdy_enabled(false); |
} else if (option == kDisableSSL) { |
- globals_->spdy_default_protocol.set(net::kProtoSPDY2); |
+ globals_->spdy_default_protocol.set(net::kProtoSPDY3); |
net::HttpStreamFactory::set_force_spdy_over_ssl(false); |
net::HttpStreamFactory::set_force_spdy_always(true); |
} else if (option == kSSL) { |
- globals_->spdy_default_protocol.set(net::kProtoSPDY2); |
+ globals_->spdy_default_protocol.set(net::kProtoSPDY3); |
net::HttpStreamFactory::set_force_spdy_over_ssl(true); |
net::HttpStreamFactory::set_force_spdy_always(true); |
} else if (option == kDisablePing) { |
@@ -802,7 +802,7 @@ void IOThread::EnableSpdy(const std::string& mode) { |
} else if (option == kForceAltProtocols) { |
net::PortAlternateProtocolPair pair; |
pair.port = 443; |
- pair.protocol = net::NPN_SPDY_2; |
+ pair.protocol = net::NPN_SPDY_3; |
net::HttpServerPropertiesImpl::ForceAlternateProtocol(pair); |
} else if (option == kSingleDomain) { |
DLOG(INFO) << "FORCING SINGLE DOMAIN"; |