Remove SPDY2 and SPDY/3.0 from tests.

net/spdy/spdy_http_utils.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/spdy/spdy_http_utils.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 152 matching lines @@
 
 COMPILE_ASSERT(HIGHEST - LOWEST < 4 &&
                HIGHEST - MINIMUM_PRIORITY < 5,
                request_priority_incompatible_with_spdy);
 
 SpdyPriority ConvertRequestPriorityToSpdyPriority(
     const RequestPriority priority,
     SpdyMajorVersion protocol_version) {
   DCHECK_GE(priority, MINIMUM_PRIORITY);
   DCHECK_LE(priority, MAXIMUM_PRIORITY);
-  if (protocol_version == SPDY2) {
-    // SPDY 2 only has 2 bits of priority, but we have 5 RequestPriorities.
-    // Map IDLE => 3, LOWEST => 2, LOW => 2, MEDIUM => 1, HIGHEST => 0.
-    if (priority > LOWEST) {
-      return static_cast<SpdyPriority>(HIGHEST - priority);
-    } else {
-      return static_cast<SpdyPriority>(HIGHEST - priority - 1);
-    }
-  } else {
-    return static_cast<SpdyPriority>(HIGHEST - priority);
-  }
+  return static_cast<SpdyPriority>(HIGHEST - priority);

[asanka, 2014/11/10 19:18:37]

Why HIGHEST here vs. MAXIMUM_PRIORITY when converting back to a RequestPriority?
They are the same value now, but I think consistency would be good between the
two conversion functions.

[Bence, 2014/11/10 22:52:09]

Done.

 }
 
 NET_EXPORT_PRIVATE RequestPriority ConvertSpdyPriorityToRequestPriority(
     SpdyPriority priority,
     SpdyMajorVersion protocol_version) {
-  // Handle invalid values gracefully, and pick LOW to map 2 back
-  // to for SPDY/2.
-  SpdyPriority idle_cutoff = (protocol_version == SPDY2) ? 3 : 5;
-  return (priority >= idle_cutoff) ?
-      IDLE : static_cast<RequestPriority>(HIGHEST - priority);
+  // Handle invalid values gracefully.
+  return (priority >= MAXIMUM_PRIORITY) ?

[asanka, 2014/11/10 19:18:37]

This compares a SpdyPriority to a RequestPriority. It's a bit confusing what's
going on. A comment describing the justification would help.

Also, could you update the corresponding comments in spdy_http_utils.h?

[Bence, 2014/11/10 22:52:09]

Good catch, thanks.  Done.

+      IDLE : static_cast<RequestPriority>(MAXIMUM_PRIORITY - priority);
 }
 
 GURL GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers,
                            SpdyMajorVersion protocol_version,
                            bool pushed) {
-  // SPDY 2 server push urls are specified in a single "url" header.
-  if (pushed && protocol_version == SPDY2) {
-      std::string url;
-      SpdyHeaderBlock::const_iterator it;
-      it = headers.find("url");
-      if (it != headers.end())
-        url = it->second;
-      return GURL(url);
-  }
-
   const char* scheme_header = protocol_version >= SPDY3 ? ":scheme" : "scheme";
   const char* host_header = protocol_version >= SPDY4 ? ":authority" :
       (protocol_version >= SPDY3 ? ":host" : "host");
   const char* path_header = protocol_version >= SPDY3 ? ":path" : "url";
 
   std::string scheme;
   std::string host_port;
   std::string path;
   SpdyHeaderBlock::const_iterator it;
   it = headers.find(scheme_header);
   if (it != headers.end())
     scheme = it->second;
   it = headers.find(host_header);
   if (it != headers.end())
     host_port = it->second;
   it = headers.find(path_header);
   if (it != headers.end())
     path = it->second;
 
   std::string url = (scheme.empty() || host_port.empty() || path.empty())
                         ? std::string()
                         : scheme + "://" + host_port + path;
   return GURL(url);
 }
 
 }  // namespace net