[SPDY] Do not advertise SPDY/2 by default

net/spdy/spdy_network_transaction_unittest.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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
@@ skipping 31 matching lines @@
 const char kRequestUrl[] = "http://www.google.com/";
 
 enum SpdyNetworkTransactionTestSSLType {
   SPDYNPN,
   SPDYNOSSL,
   SPDYSSL,
 };
 
 struct SpdyNetworkTransactionTestParams {
   SpdyNetworkTransactionTestParams()
-      : protocol(kProtoSPDY2),
+      : protocol(kProtoSPDY3),
         ssl_type(SPDYNPN) {}
 
   SpdyNetworkTransactionTestParams(
       NextProto protocol,
       SpdyNetworkTransactionTestSSLType ssl_type)
       : protocol(protocol),
         ssl_type(ssl_type) {}
 
   NextProto protocol;
   SpdyNetworkTransactionTestSSLType ssl_type;
@@ skipping 583 matching lines @@
 //-----------------------------------------------------------------------------
 // All tests are run with three different connection types: SPDY after NPN
 // negotiation, SPDY without SSL, and SPDY with SSL.
 //
 // TODO(akalin): Use ::testing::Combine() when we are able to use
 // <tr1/tuple>.
 INSTANTIATE_TEST_CASE_P(
     Spdy,
     SpdyNetworkTransactionTest,
     ::testing::Values(
-        SpdyNetworkTransactionTestParams(kProtoSPDY2, SPDYNOSSL),
-        SpdyNetworkTransactionTestParams(kProtoSPDY2, SPDYSSL),
-        SpdyNetworkTransactionTestParams(kProtoSPDY2, SPDYNPN),
+        SpdyNetworkTransactionTestParams(kProtoDeprecatedSPDY2, SPDYNOSSL),
+        SpdyNetworkTransactionTestParams(kProtoDeprecatedSPDY2, SPDYSSL),
+        SpdyNetworkTransactionTestParams(kProtoDeprecatedSPDY2, SPDYNPN),
         SpdyNetworkTransactionTestParams(kProtoSPDY3, SPDYNOSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY3, SPDYSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY3, SPDYNPN),
         SpdyNetworkTransactionTestParams(kProtoSPDY31, SPDYNOSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY31, SPDYSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY31, SPDYNPN),
         SpdyNetworkTransactionTestParams(kProtoSPDY4a2, SPDYNOSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY4a2, SPDYSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY4a2, SPDYNPN),
         SpdyNetworkTransactionTestParams(kProtoHTTP2Draft04, SPDYNOSSL),
@@ skipping 5730 matching lines @@
   // since we're send-stalled.
   EXPECT_TRUE(stream->stream()->send_stalled_by_flow_control());
 
   // Read in WINDOW_UPDATE or SETTINGS frame.
   data.RunFor((GetParam().protocol >= kProtoSPDY31) ? 8 : 7);
   rv = callback.WaitForResult();
   helper.VerifyDataConsumed();
 }
 
 }  // namespace net