[SPDY] Enable tests for SPDY/3.1 and SPDY/4

net/http/http_stream_factory_impl.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 "net/http/http_stream_factory_impl.h"
 
 #include <string>
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 208 matching lines @@
   // single user on a multi-user system to hijack the alternate protocol.
   // These systems also enforce ports <1024 as restricted ports.  So don't
   // allow protocol upgrades to user-controllable ports.
   const int kUnrestrictedPort = 1024;
   if (!session_->params().enable_user_alternate_protocol_ports &&
       (alternate.port >= kUnrestrictedPort &&
        origin.port() < kUnrestrictedPort))
     return kNoAlternateProtocol;
 
   origin.set_port(alternate.port);
-  if (alternate.protocol >= NPN_SPDY_2 && alternate.protocol <= NPN_SPDY_3) {
+  if (alternate.protocol >= NPN_SPDY_MINIMUM_VERSION &&
+      alternate.protocol <= NPN_SPDY_MAXIMUM_VERSION) {
     if (!spdy_enabled())
       return kNoAlternateProtocol;
 
     if (HttpStreamFactory::HasSpdyExclusion(origin))
       return kNoAlternateProtocol;
 
     *alternate_url = UpgradeUrlToHttps(original_url, alternate.port);
   } else {
     DCHECK_EQ(QUIC, alternate.protocol);
     if (!session_->params().enable_quic ||
@@ skipping 108 matching lines @@
        it != requests_to_fail.end(); ++it) {
     Request* request = *it;
     if (request == request_map_[job]) {
       continue;
     }
     request->OnStreamFailed(NULL, status, used_ssl_config);
   }
 }
 
 }  // namespace net