Update from chromium https://crrev.com/301315

net/http/http_server_properties.h

Index: net/http/http_server_properties.h
diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h
index ae12052f2e2297128082a0c793022c5a0b5340a5..e171075268b2d8d3e511f1d7124ff4afe35b4041 100644
--- a/net/http/http_server_properties.h
+++ b/net/http/http_server_properties.h
@@ -18,15 +18,6 @@
 
 namespace net {
 
-enum AlternateProtocolExperiment {
-  // 200 alternate_protocol servers are loaded (persisted 200 MRU servers).
-  ALTERNATE_PROTOCOL_NOT_PART_OF_EXPERIMENT = 0,
-  // 200 alternate_protocol servers are loaded (persisted 1000 MRU servers).
-  ALTERNATE_PROTOCOL_TRUNCATED_200_SERVERS,
-  // 1000 alternate_protocol servers are loaded (persisted 1000 MRU servers).
-  ALTERNATE_PROTOCOL_TRUNCATED_1000_SERVERS,
-};
-
 enum AlternateProtocolUsage {
   // Alternate Protocol was used without racing a normal connection.
   ALTERNATE_PROTOCOL_USAGE_NO_RACE = 0,
@@ -44,10 +35,8 @@ enum AlternateProtocolUsage {
   ALTERNATE_PROTOCOL_USAGE_MAX,
 };
 
-// Log a histogram to reflect |usage| and |alternate_protocol_experiment|.
-NET_EXPORT void HistogramAlternateProtocolUsage(
-    AlternateProtocolUsage usage,
-    AlternateProtocolExperiment alternate_protocol_experiment);
+// Log a histogram to reflect |usage|.
+NET_EXPORT void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage);
 
 enum BrokenAlternateProtocolLocation {
   BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB = 0,
@@ -193,9 +182,6 @@ class NET_EXPORT HttpServerProperties {
   // Returns all Alternate-Protocol mappings.
   virtual const AlternateProtocolMap& alternate_protocol_map() const = 0;
 
-  virtual void SetAlternateProtocolExperiment(
-      AlternateProtocolExperiment experiment) = 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
@@ -204,9 +190,6 @@ class NET_EXPORT HttpServerProperties {
   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(