[SPDY] Do not advertise SPDY/2 by default

chrome/browser/net/http_server_properties_manager_unittest.cc

Index: chrome/browser/net/http_server_properties_manager_unittest.cc
diff --git a/chrome/browser/net/http_server_properties_manager_unittest.cc b/chrome/browser/net/http_server_properties_manager_unittest.cc
index 7bb3fe1ab0b7956b277fce38fcd65d1784ae5e9e..64da47a8fb693eb05a680610d1952df7c0af5387 100644
--- a/chrome/browser/net/http_server_properties_manager_unittest.cc
+++ b/chrome/browser/net/http_server_properties_manager_unittest.cc
@@ -152,7 +152,7 @@ TEST_F(HttpServerPropertiesManagerTest,
   // Set up alternate_protocol for www.google.com:80.
   base::DictionaryValue* alternate_protocol = new base::DictionaryValue;
   alternate_protocol->SetInteger("port", 443);
-  alternate_protocol->SetString("protocol_str", "npn-spdy/2");
+  alternate_protocol->SetString("protocol_str", "npn-spdy/3");
   server_pref_dict->SetWithoutPathExpansion(
       "alternate_protocol", alternate_protocol);
 
@@ -173,7 +173,7 @@ TEST_F(HttpServerPropertiesManagerTest,
   // Set up alternate_protocol for mail.google.com:80
   base::DictionaryValue* alternate_protocol1 = new base::DictionaryValue;
   alternate_protocol1->SetInteger("port", 444);
-  alternate_protocol1->SetString("protocol_str", "npn-spdy/3");
+  alternate_protocol1->SetString("protocol_str", "npn-spdy/3.1");
 
   server_pref_dict1->SetWithoutPathExpansion(
       "alternate_protocol", alternate_protocol1);
@@ -218,12 +218,12 @@ TEST_F(HttpServerPropertiesManagerTest,
       http_server_props_manager_->GetAlternateProtocol(
           net::HostPortPair::FromString("www.google.com:80"));
   EXPECT_EQ(443, port_alternate_protocol.port);
-  EXPECT_EQ(net::NPN_SPDY_2, port_alternate_protocol.protocol);
+  EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocol.protocol);
   port_alternate_protocol =
       http_server_props_manager_->GetAlternateProtocol(
           net::HostPortPair::FromString("mail.google.com:80"));
   EXPECT_EQ(444, port_alternate_protocol.port);
-  EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocol.protocol);
+  EXPECT_EQ(net::NPN_SPDY_3_1, port_alternate_protocol.protocol);
 
   // Verify pipeline capability.
   EXPECT_EQ(net::PIPELINE_CAPABLE,
@@ -360,7 +360,7 @@ TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
   EXPECT_FALSE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
   http_server_props_manager_->SetAlternateProtocol(
-      spdy_server_mail, 443, net::NPN_SPDY_2);
+      spdy_server_mail, 443, net::NPN_SPDY_3);
 
   // Run the task.
   loop_.RunUntilIdle();
@@ -371,7 +371,7 @@ TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
   net::PortAlternateProtocolPair port_alternate_protocol =
       http_server_props_manager_->GetAlternateProtocol(spdy_server_mail);
   EXPECT_EQ(443, port_alternate_protocol.port);
-  EXPECT_EQ(net::NPN_SPDY_2, port_alternate_protocol.protocol);
+  EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocol.protocol);
 }
 
 TEST_F(HttpServerPropertiesManagerTest, PipelineCapability) {
@@ -407,7 +407,7 @@ TEST_F(HttpServerPropertiesManagerTest, Clear) {
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
   http_server_props_manager_->SetAlternateProtocol(
-      spdy_server_mail, 443, net::NPN_SPDY_2);
+      spdy_server_mail, 443, net::NPN_SPDY_3);
 
   const net::SpdySettingsIds id1 = net::SETTINGS_UPLOAD_BANDWIDTH;
   const net::SpdySettingsFlags flags1 = net::SETTINGS_FLAG_PLEASE_PERSIST;