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

net/http/http_server_properties.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_H_
 #define NET_HTTP_HTTP_SERVER_PROPERTIES_H_
 
 #include <map>
 #include <string>
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_export.h"
 #include "net/http/http_pipelined_host_capability.h"
 #include "net/socket/next_proto.h"
 #include "net/spdy/spdy_framer.h"  // TODO(willchan): Reconsider this.
 
 namespace net {
 
 enum AlternateProtocol {
-  NPN_SPDY_1 = 0,
-  NPN_SPDY_MINIMUM_VERSION = NPN_SPDY_1,
-  NPN_SPDY_2,
+  NPN_SPDY_2 = 0,
+  ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION = NPN_SPDY_2,
+  NPN_SPDY_MINIMUM_VERSION = NPN_SPDY_2,
   NPN_SPDY_3,
   NPN_SPDY_3_1,
   NPN_SPDY_4A2,
   // We lump in HTTP/2 with the SPDY protocols for now.
   NPN_HTTP2_DRAFT_04,
   NPN_SPDY_MAXIMUM_VERSION = NPN_HTTP2_DRAFT_04,
   QUIC,
-  NUM_ALTERNATE_PROTOCOLS,
+  ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION = QUIC,
   ALTERNATE_PROTOCOL_BROKEN,  // The alternate protocol is known to be broken.
   UNINITIALIZED_ALTERNATE_PROTOCOL,
 };
 
+// Simply returns whether |protocol| is between
+// ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION and
+// ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION (inclusive).
+NET_EXPORT bool IsAlternateProtocolValid(AlternateProtocol protocol);
+
+enum AlternateProtocolSize {
+  NUM_VALID_ALTERNATE_PROTOCOLS =
+    ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION -
+    ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION + 1,
+};
+
 NET_EXPORT const char* AlternateProtocolToString(AlternateProtocol protocol);
 NET_EXPORT AlternateProtocol AlternateProtocolFromString(
-    const std::string& protocol);
+    const std::string& str);
 NET_EXPORT_PRIVATE AlternateProtocol AlternateProtocolFromNextProto(
     NextProto next_proto);
 
 struct NET_EXPORT PortAlternateProtocolPair {
   bool Equals(const PortAlternateProtocolPair& other) const {
     return port == other.port && protocol == other.protocol;
   }
 
   std::string ToString() const;
 
@@ skipping 83 matching lines @@
 
   virtual PipelineCapabilityMap GetPipelineCapabilityMap() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_H_