[SPDY] Do not advertise SPDY/2 by default

chrome/browser/chrome_net_benchmarking_message_filter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 94 matching lines @@
 // TODO(lzheng): This only enables spdy over ssl. Enable spdy for http
 // when needed.
 void ChromeNetBenchmarkingMessageFilter::OnEnableSpdy(bool enable) {
   // This function is disabled unless the user has enabled
   // benchmarking extensions.
   if (!CheckBenchmarkingEnabled()) {
     NOTREACHED() << "Received unexpected benchmarking IPC";
     return;
   }
   if (enable) {
-    net::HttpStreamFactory::EnableNpnSpdy();
+    net::HttpStreamFactory::EnableNpnSpdy3();
     net::HttpNetworkLayer::ForceAlternateProtocol();
   } else {
     net::HttpStreamFactory::EnableNpnHttpOnly();
   }
 }
 
 void ChromeNetBenchmarkingMessageFilter::OnCloseCurrentConnections() {
   // This function is disabled unless the user has enabled
   // benchmarking extensions.
   if (!CheckBenchmarkingEnabled()) {
@@ skipping 35 matching lines @@
   static bool checked = false;
   static bool result = false;
   if (!checked) {
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     result = command_line.HasSwitch(switches::kEnableNetBenchmarking);
     checked = true;
   }
   return result;
 }