[SPDY] Do not advertise SPDY/2 by default

chrome/browser/net/http_server_properties_manager_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 "chrome/browser/net/http_server_properties_manager.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 134 matching lines @@
   // it twice. Only expect a single cache update.
 
   base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
 
   // Set supports_spdy for www.google.com:80.
   server_pref_dict->SetBoolean("supports_spdy", true);
 
   // 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);
 
   // Set pipeline capability for www.google.com:80.
   server_pref_dict->SetInteger("pipeline_capability", net::PIPELINE_CAPABLE);
 
   // Set the server preference for www.google.com:80.
   base::DictionaryValue* servers_dict = new base::DictionaryValue;
   servers_dict->SetWithoutPathExpansion(
       "www.google.com:80", server_pref_dict);
 
   // Set the preference for mail.google.com server.
   base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
 
   // Set supports_spdy for mail.google.com:80
   server_pref_dict1->SetBoolean("supports_spdy", true);
 
   // 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);
 
   // Set pipelining capability for mail.google.com:80
   server_pref_dict1->SetInteger("pipeline_capability", net::PIPELINE_INCAPABLE);
 
   // Set the server preference for mail.google.com:80.
   servers_dict->SetWithoutPathExpansion(
       "mail.google.com:80", server_pref_dict1);
@@ skipping 24 matching lines @@
 
   // Verify AlternateProtocol.
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
       net::HostPortPair::FromString("www.google.com:80")));
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
       net::HostPortPair::FromString("mail.google.com:80")));
   net::PortAlternateProtocolPair port_alternate_protocol =
       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,
             http_server_props_manager_->GetPipelineCapability(
                 net::HostPortPair::FromString("www.google.com:80")));
   EXPECT_EQ(net::PIPELINE_INCAPABLE,
             http_server_props_manager_->GetPipelineCapability(
                 net::HostPortPair::FromString("mail.google.com:80")));
 }
 
@@ skipping 116 matching lines @@
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
   ExpectPrefsUpdate();
 
   net::HostPortPair spdy_server_mail("mail.google.com", 80);
   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();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   ASSERT_TRUE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
   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) {
   ExpectPrefsUpdate();
 
   net::HostPortPair known_pipeliner("pipeline.com", 8080);
   net::HostPortPair bad_pipeliner("wordpress.com", 80);
   EXPECT_EQ(net::PIPELINE_UNKNOWN,
             http_server_props_manager_->GetPipelineCapability(known_pipeliner));
   EXPECT_EQ(net::PIPELINE_UNKNOWN,
@@ skipping 15 matching lines @@
             http_server_props_manager_->GetPipelineCapability(bad_pipeliner));
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, Clear) {
   ExpectPrefsUpdate();
 
   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;
   const uint32 value1 = 31337;
   http_server_props_manager_->SetSpdySetting(
       spdy_server_mail, id1, flags1, value1);
 
   net::HostPortPair known_pipeliner("pipeline.com", 8080);
   http_server_props_manager_->SetPipelineCapability(known_pipeliner,
                                                     net::PIPELINE_CAPABLE);
@@ skipping 107 matching lines @@
   // Run the task after shutdown, but before deletion.
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   loop_.RunUntilIdle();
 }
 
 }  // namespace
 
 }  // namespace chrome_browser_net