[SPDY] Remove references to obsolete SPDY versions SPDY/1 and SPDY/2.1

net/spdy/spdy_test_util_common.cc

 // Copyright (c) 2013 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_test_util_common.h"
 
 #include <cstddef>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 12 matching lines @@
 #include "net/spdy/spdy_http_utils.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/spdy/spdy_stream.h"
 
 namespace net {
 
 namespace {
 
 bool next_proto_is_spdy(NextProto next_proto) {
-  // TODO(akalin): Change this to kProtoSPDYMinimumVersion once we
-  // stop supporting SPDY/1.
-  return next_proto >= kProtoSPDY2 && next_proto <= kProtoSPDYMaximumVersion;
+  return next_proto >= kProtoSPDYMinimumVersion &&
+      next_proto <= kProtoSPDYMaximumVersion;
 }
 
 // Parses a URL into the scheme, host, and path components required for a
 // SPDY request.
 void ParseUrl(base::StringPiece url, std::string* scheme, std::string* host,
               std::string* path) {
   GURL gurl(url.as_string());
   path->assign(gurl.PathForRequest());
   scheme->assign(gurl.scheme());
   host->assign(gurl.host());
   if (gurl.has_port()) {
     host->append(":");
     host->append(gurl.port());
   }
 }
 
 }  // namespace
 
 std::vector<NextProto> SpdyNextProtos() {
   std::vector<NextProto> next_protos;
   for (int i = kProtoMinimumVersion; i <= kProtoMaximumVersion; ++i) {
-    NextProto proto = static_cast<NextProto>(i);
-    if (proto != kProtoSPDY1 && proto != kProtoSPDY21)
-      next_protos.push_back(proto);
+    next_protos.push_back(static_cast<NextProto>(i));
   }
   return next_protos;
 }
 
 // Chop a frame into an array of MockWrites.
 // |data| is the frame to chop.
 // |length| is the length of the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockWrite* ChopWriteFrame(const char* data, int length, int num_chunks) {
   MockWrite* chunks = new MockWrite[num_chunks];
@@ skipping 1154 matching lines @@
   (*headers)[GetSchemeKey()] = scheme.c_str();
   (*headers)[GetVersionKey()] = "HTTP/1.1";
   if (content_length) {
     std::string length_str = base::Int64ToString(*content_length);
     (*headers)["content-length"] = length_str;
   }
   return headers.Pass();
 }
 
 }  // namespace net