diff options
| -rw-r--r-- | chrome/browser/browser_main.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 | ||||
| -rw-r--r-- | net/http/http_network_layer.cc | 1 |
4 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 4f138e2..137b92ae 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -367,9 +367,6 @@ void InitializeNetworkOptions(const CommandLine& parsed_command_line) { if (parsed_command_line.HasSwitch(switches::kIgnoreCertificateErrors)) net::HttpNetworkTransaction::IgnoreCertificateErrors(true); - if (parsed_command_line.HasSwitch(switches::kUseAlternateProtocols)) - net::HttpNetworkTransaction::SetUseAlternateProtocols(true); - if (parsed_command_line.HasSwitch(switches::kMaxSpdySessionsPerDomain)) { int value = StringToInt( parsed_command_line.GetSwitchValueASCII( diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 0e488c3..a3e5df5 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -784,9 +784,6 @@ const char kIgnoreCertificateErrors[] = "ignore-certificate-errors"; // Set the maximum SPDY sessions per domain. const char kMaxSpdySessionsPerDomain[] = "max-spdy-sessions-per-domain"; -// Enable Alternate-Protocol support. -const char kUseAlternateProtocols[] = "use-alternate-protocols"; - // Use the low fragmentation heap for the CRT. const char kUseLowFragHeapCrt[] = "use-lf-heap"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index a52b316..cd969df 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -220,7 +220,6 @@ extern const char kFixedHttpPort[]; extern const char kFixedHttpsPort[]; extern const char kIgnoreCertificateErrors[]; extern const char kMaxSpdySessionsPerDomain[]; -extern const char kUseAlternateProtocols[]; extern const char kUseLowFragHeapCrt[]; extern const char kUserAgent[]; extern const char kUserDataDir[]; diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc index 294e54e..09ee5cd 100644 --- a/net/http/http_network_layer.cc +++ b/net/http/http_network_layer.cc @@ -140,6 +140,7 @@ void HttpNetworkLayer::EnableSpdy(const std::string& mode) { } else if (option == kDisableCompression) { spdy::SpdyFramer::set_enable_compression_default(false); } else if (option == kEnableNPN) { + net::HttpNetworkTransaction::SetUseAlternateProtocols(true); // Except for the first element, the order is irrelevant. First element // specifies the fallback in case nothing matches // (SSLClientSocket::kNextProtoNoOverlap). Otherwise, the SSL library |