Revert of Add a probability to Alternate-Protocol support.

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"
@@ skipping 74 matching lines @@
     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& str);
 NET_EXPORT_PRIVATE AlternateProtocol AlternateProtocolFromNextProto(
     NextProto next_proto);
 
-struct NET_EXPORT AlternateProtocolInfo {
-  AlternateProtocolInfo(uint16 port,
-                        AlternateProtocol protocol,
-                        double probability)
-      : port(port),
-        protocol(protocol),
-        probability(probability) {}
-
-  bool Equals(const AlternateProtocolInfo& other) const {
-    return port == other.port &&
-        protocol == other.protocol &&
-        probability == other.probability;
+struct NET_EXPORT PortAlternateProtocolPair {
+  bool Equals(const PortAlternateProtocolPair& other) const {
+    return port == other.port && protocol == other.protocol;
   }
 
   std::string ToString() const;
 
   uint16 port;
   AlternateProtocol protocol;
-  double probability;
 };
 
 typedef base::MRUCache<
-    HostPortPair, AlternateProtocolInfo> AlternateProtocolMap;
+    HostPortPair, PortAlternateProtocolPair> AlternateProtocolMap;
 typedef base::MRUCache<HostPortPair, SettingsMap> SpdySettingsMap;
 
 extern const char kAlternateProtocolHeader[];
 
 // The interface for setting/retrieving the HTTP server properties.
 // Currently, this class manages servers':
 // * SPDY support (based on NPN results)
 // * Alternate-Protocol support
 // * Spdy Settings (like CWND ID field)
 class NET_EXPORT HttpServerProperties {
@@ skipping 18 matching lines @@
   // Add |server| into the persistent store. Should only be called from IO
   // thread.
   virtual void SetSupportsSpdy(const HostPortPair& server,
                                bool support_spdy) = 0;
 
   // Returns true if |server| has an Alternate-Protocol header.
   virtual bool HasAlternateProtocol(const HostPortPair& server) = 0;
 
   // Returns the Alternate-Protocol and port for |server|.
   // HasAlternateProtocol(server) must be true.
-  virtual AlternateProtocolInfo GetAlternateProtocol(
+  virtual PortAlternateProtocolPair GetAlternateProtocol(
       const HostPortPair& server) = 0;
 
   // Sets the Alternate-Protocol for |server|.
   virtual void SetAlternateProtocol(const HostPortPair& server,
                                     uint16 alternate_port,
-                                    AlternateProtocol alternate_protocol,
-                                    double probability) = 0;
+                                    AlternateProtocol alternate_protocol) = 0;
 
   // Sets the Alternate-Protocol for |server| to be BROKEN.
   virtual void SetBrokenAlternateProtocol(const HostPortPair& server) = 0;
 
   // Returns true if Alternate-Protocol for |server| was recently BROKEN.
   virtual bool WasAlternateProtocolRecentlyBroken(
       const HostPortPair& server) = 0;
 
   // Confirms that Alternate-Protocol for |server| is working.
   virtual void ConfirmAlternateProtocol(const HostPortPair& server) = 0;
 
   // Clears the Alternate-Protocol for |server|.
   virtual void ClearAlternateProtocol(const HostPortPair& server) = 0;
 
   // Returns all Alternate-Protocol mappings.
   virtual const AlternateProtocolMap& alternate_protocol_map() const = 0;
 
   virtual void SetAlternateProtocolExperiment(
       AlternateProtocolExperiment experiment) = 0;
 
-  virtual void SetAlternateProtocolProbabilityThreshold(
-      double threshold) = 0;
-
   virtual AlternateProtocolExperiment GetAlternateProtocolExperiment()
       const = 0;
 
   // Gets a reference to the SettingsMap stored for a host.
   // If no settings are stored, returns an empty SettingsMap.
   virtual const SettingsMap& GetSpdySettings(
       const HostPortPair& host_port_pair) = 0;
 
   // Saves an individual SPDY setting for a host. Returns true if SPDY setting
   // is to be persisted.
@@ skipping 17 matching lines @@
   virtual const NetworkStats* GetServerNetworkStats(
       const HostPortPair& host_port_pair) const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_H_