commit 6165015eccc697c59a21ed139a526b78ab9426e6
author James Robinson <jamesr@chromium.org> Sun Oct 26 23:24:55 2014 -0700
committer James Robinson <jamesr@chromium.org> Sun Oct 26 23:24:55 2014 -0700
tree 746e815e2efd337ec0d9561f5645f1e83bf53c4d
parent 15b9d4ab8e037e35fafa88c70fbfd239cfa19c48

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

This updates from chromium commit
060d7dc875cc41f46ab264181d1d622d02c3c8b7 aka commit position 301315. The
following changes from earlier rolls are included:

*) Remove gpu_media.patch, no longer needed thanks to
  https://crrev.com/301048
*) Added skia_build.patch to resolve blink dependency added by
  https://crrev.com/301105
*) Applied mojo changes for https://crrev.com/301165

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/681713002

net/http/http_stream_factory_impl_job.cc

diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 45d152a..a11dd2e 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -1430,28 +1430,17 @@
 }
 
 void HttpStreamFactoryImpl::Job::ReportJobSuccededForRequest() {
-  net::AlternateProtocolExperiment alternate_protocol_experiment =
-      ALTERNATE_PROTOCOL_NOT_PART_OF_EXPERIMENT;
-  base::WeakPtr<HttpServerProperties> http_server_properties =
-      session_->http_server_properties();
-  if (http_server_properties) {
-    alternate_protocol_experiment =
-        http_server_properties->GetAlternateProtocolExperiment();
-  }
   if (using_existing_quic_session_) {
     // If an existing session was used, then no TCP connection was
     // started.
-    HistogramAlternateProtocolUsage(ALTERNATE_PROTOCOL_USAGE_NO_RACE,
-                                    alternate_protocol_experiment);
+    HistogramAlternateProtocolUsage(ALTERNATE_PROTOCOL_USAGE_NO_RACE);
   } else if (original_url_) {
     // This job was the alternate protocol job, and hence won the race.
-    HistogramAlternateProtocolUsage(ALTERNATE_PROTOCOL_USAGE_WON_RACE,
-                                    alternate_protocol_experiment);
+    HistogramAlternateProtocolUsage(ALTERNATE_PROTOCOL_USAGE_WON_RACE);
   } else {
     // This job was the normal job, and hence the alternate protocol job lost
     // the race.
-    HistogramAlternateProtocolUsage(ALTERNATE_PROTOCOL_USAGE_LOST_RACE,
-                                    alternate_protocol_experiment);
+    HistogramAlternateProtocolUsage(ALTERNATE_PROTOCOL_USAGE_LOST_RACE);
   }
 }