Clean up dependencies for disk_cache histogram_macros.h.

chrome/browser/net/http_pipelining_compatibility_client.cc

 // 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.
 
 #include "chrome/browser/net/http_pipelining_compatibility_client.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/request_priority.h"
-#include "net/disk_cache/histogram_macros.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_version.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+// This is included because the CACHE_HISTOGRAM_* macros allow dynamic metric
+// names.
+// TODO(gavinp): Clean up this dependency by moving the needed functionality
+// into base/.
+#include "net/disk_cache/histogram_macros.h"
+
 namespace chrome_browser_net {
 
 static const int kCanaryRequestId = 999;
 
 namespace {
 
 // There is one Request per RequestInfo passed in to Start() above.
 class Request : public internal::PipelineTestRequest,
                 public net::URLRequest::Delegate {
  public:
@@ skipping 319 matching lines @@
   UMA_HISTOGRAM_BOOLEAN("NetConnectivity.Pipeline.CanarySuccess", success);
   if (success) {
     StartTestRequests();
   } else {
     finished_callback_.Run(0);
   }
 }
 
 void HttpPipeliningCompatibilityClient::OnRequestFinished(
     int request_id, internal::PipelineTestRequest::Status status) {
-  // The CACHE_HISTOGRAM_* macros are used, because they allow dynamic metric
-  // names.
   CACHE_HISTOGRAM_ENUMERATION(GetMetricName(request_id, "Status"),
                               status,
                               internal::PipelineTestRequest::STATUS_MAX);
 
   ++num_finished_;
   if (status == internal::PipelineTestRequest::STATUS_SUCCESS) {
     ++num_succeeded_;
   }
   if (num_finished_ == requests_.size()) {
     UMA_HISTOGRAM_BOOLEAN("NetConnectivity.Pipeline.Success",
@@ skipping 151 matching lines @@
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&CollectPipeliningCapabilityStatsOnIOThread,
                  pipeline_test_server,
                  io_thread));
 }
 
 }  // namespace chrome_browser_net