Support HTTP/2 drafts 14 and 15 simultaneously.

chrome/browser/io_thread_unittest.cc

 // Copyright 2014 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 "base/command_line.h"
 #include "chrome/browser/io_thread.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/quic/quic_protocol.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 75 matching lines @@
   EXPECT_TRUE(use_alternate_protocols);
 }
 
 TEST_F(IOThreadTest, SpdyFieldTrialSpdy4Enabled) {
   bool use_alternate_protocols = false;
   IOThreadPeer::ConfigureSpdyFromTrial("Spdy4Enabled", &globals_);
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11,
                           net::kProtoQUIC1SPDY3,
                           net::kProtoSPDY31,
-                          net::kProtoSPDY4));
+                          net::kProtoSPDY4_14,
+                          net::kProtoSPDY4_15));
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
   EXPECT_TRUE(use_alternate_protocols);
 }
 
 TEST_F(IOThreadTest, SpdyFieldTrialSpdy4Control) {
   bool use_alternate_protocols = false;
   IOThreadPeer::ConfigureSpdyFromTrial("Spdy4Control", &globals_);
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11,
                           net::kProtoQUIC1SPDY3,
@@ skipping 233 matching lines @@
   field_trial_group_ = "Enabled";
   field_trial_params_["alternate_protocol_probability_threshold"] = ".5";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(.5, params.alternate_protocol_probability_threshold);
 }
 
 }  // namespace test