SPDY: Alternate-Protocol changes.

Change chromium to expect npn-spdy/1 instead of npn-spdy to match server-side changes.
Move the use of Alternate-Protocol to be behind command line flag: "--use-alternate-protocols".

Review URL: http://codereview.chromium.org/1593029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44663 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 5 deletions

diff --git a/net/http/http_alternate_protocols_unittest.cc b/net/http/http_alternate_protocols_unittest.cc
index 7f94534..f725fc0 100644
--- a/net/http/http_alternate_protocols_unittest.cc
+++ b/net/http/http_alternate_protocols_unittest.cc
@@ -19,14 +19,13 @@ TEST(HttpAlternateProtocols, Basic) {
   test_host_port_pair.port = 80;
   EXPECT_FALSE(
       alternate_protocols.HasAlternateProtocolFor(test_host_port_pair));
-  alternate_protocols.SetAlternateProtocolFor(test_host_port_pair,
-                                              443,
-                                              HttpAlternateProtocols::NPN_SPDY);
+  alternate_protocols.SetAlternateProtocolFor(
+      test_host_port_pair, 443, HttpAlternateProtocols::NPN_SPDY_1);
   ASSERT_TRUE(alternate_protocols.HasAlternateProtocolFor(test_host_port_pair));
   const HttpAlternateProtocols::PortProtocolPair alternate =
       alternate_protocols.GetAlternateProtocolFor(test_host_port_pair);
   EXPECT_EQ(443, alternate.port);
-  EXPECT_EQ(HttpAlternateProtocols::NPN_SPDY, alternate.protocol);
+  EXPECT_EQ(HttpAlternateProtocols::NPN_SPDY_1, alternate.protocol);
 }
 
 TEST(HttpAlternateProtocols, SetBroken) {
@@ -43,7 +42,7 @@ TEST(HttpAlternateProtocols, SetBroken) {
   alternate_protocols.SetAlternateProtocolFor(
       test_host_port_pair,
       1234,
-      HttpAlternateProtocols::NPN_SPDY),
+      HttpAlternateProtocols::NPN_SPDY_1),
   alternate = alternate_protocols.GetAlternateProtocolFor(test_host_port_pair);
   EXPECT_EQ(HttpAlternateProtocols::BROKEN, alternate.protocol)
       << "Second attempt should be ignored.";