Make GetAlternateProtocol return AlternativeService.

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 187 matching lines @@
   // Require HTTP/1.1 on subsequent connections.  Not persisted.
   virtual void SetHTTP11Required(const HostPortPair& server) = 0;
 
   // Modify SSLConfig to force HTTP/1.1.
   static void ForceHTTP11(SSLConfig* ssl_config);
 
   // Modify SSLConfig to force HTTP/1.1 if necessary.
   virtual void MaybeForceHTTP11(const HostPortPair& server,
                                 SSLConfig* ssl_config) = 0;
 
-  // Returns the AlternateProtocol for |server| if it has probability equal to
+  // Returns the alternative service for |origin| if it has probability equal to
   // or exceeding threshold, or else the forced AlternateProtocol if there is
   // one, or else one with UNINITIALIZED_ALTERNATE_PROTOCOL.
-  virtual AlternateProtocolInfo GetAlternateProtocol(
-      const HostPortPair& server) = 0;
+  virtual AlternativeService GetAlternativeService(
+      const HostPortPair& origin) = 0;
 
   // Sets the Alternate-Protocol for |server|.
-  virtual void SetAlternateProtocol(const HostPortPair& server,
+  virtual void SetAlternateProtocol(const HostPortPair& origin,
                                     uint16 alternate_port,
                                     AlternateProtocol alternate_protocol,
                                     double probability) = 0;
 
   // Sets the Alternate-Protocol for |server| to be BROKEN.
-  virtual void SetBrokenAlternateProtocol(const HostPortPair& server) = 0;
+  virtual void SetBrokenAlternateProtocol(const HostPortPair& origin) = 0;
 
   // Marks |alternative_service| as recently broken.
   virtual void MarkAlternativeServiceRecentlyBroken(
       const AlternativeService& alternative_service) = 0;
 
   // Returns true iff |alternative_service| is currently broken.
   virtual bool IsAlternativeServiceBroken(
       const AlternativeService& alternative_service) = 0;
 
   // Returns true if Alternate-Protocol for |server| was recently BROKEN.
   virtual bool WasAlternateProtocolRecentlyBroken(
-      const HostPortPair& server) = 0;
+      const HostPortPair& origin) = 0;
 
   // Confirms that Alternate-Protocol for |server| is working.
-  virtual void ConfirmAlternateProtocol(const HostPortPair& server) = 0;
+  virtual void ConfirmAlternateProtocol(const HostPortPair& origin) = 0;
 
   // Clears the Alternate-Protocol for |server|.
-  virtual void ClearAlternateProtocol(const HostPortPair& server) = 0;
+  virtual void ClearAlternateProtocol(const HostPortPair& origin) = 0;
 
   // Returns all Alternate-Protocol mappings.
   virtual const AlternateProtocolMap& alternate_protocol_map() const = 0;
 
   // Sets the threshold to be used when evaluating Alternate-Protocol
   // advertisments. Only advertisements with a with a probability
   // greater than |threshold| will be honored. |threshold| must be
   // between 0 and 1 inclusive. Hence, a threshold of 0 implies that
   // all advertisements will be honored.
   virtual void SetAlternateProtocolProbabilityThreshold(
@@ skipping 33 matching lines @@
 
   virtual const ServerNetworkStatsMap& server_network_stats_map() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_H_