Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index d72cefcc0e90ece0987c7a9fde7e1f3d488e97ae..42645ea3425335a2a1c92fa9ffd74865e39603d0 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -733,8 +733,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::kEnableSpdy2)) { |
- net::HttpStreamFactory::EnableNpnSpdy31WithSpdy2(); |
+ } else if (command_line.HasSwitch(switches::kDisableSpdy2)) { |
+ net::HttpStreamFactory::EnableNpnSpdy31(); |
} else if (command_line.HasSwitch(switches::kEnableNpnHttpOnly)) { |
net::HttpStreamFactory::EnableNpnHttpOnly(); |
} else { |
@@ -743,7 +743,10 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) { |
net::HttpStreamFactory::set_spdy_enabled(false); |
} else { |
// Use SPDY/3.1 by default. |
- net::HttpStreamFactory::EnableNpnSpdy31(); |
+ // |
+ // TODO(akalin): Turn off SPDY/2 by default |
+ // (http://crbug.com/318651). |
+ net::HttpStreamFactory::EnableNpnSpdy31WithSpdy2(); |
} |
} |
} |