SPDY - default to SPDY/2.1 protocol in unittests

net/http/http_network_layer.cc

Index: net/http/http_network_layer.cc
===================================================================
--- net/http/http_network_layer.cc	(revision 118987)
+++ net/http/http_network_layer.cc	(working copy)
@@ -101,6 +101,7 @@
       std::vector<std::string> next_protos;
       next_protos.push_back("http/1.1");
       next_protos.push_back("spdy/2");
+      next_protos.push_back("spdy/2.1");
       HttpStreamFactory::set_next_protos(next_protos);
     } else if (option == kEnableNpnHttpOnly) {
       // Avoid alternate protocol in this case. Otherwise, browser will try SSL
@@ -129,7 +130,7 @@
     } else if (option == kForceAltProtocols) {
       PortAlternateProtocolPair pair;
       pair.port = 443;
-      pair.protocol = NPN_SPDY_2;
+      pair.protocol = NPN_SPDY_21;
       HttpServerPropertiesImpl::ForceAlternateProtocol(pair);
     } else if (option == kSingleDomain) {
       SpdySessionPool::ForceSingleDomain();