Remove dependencies of Metrics{Service,Log} on g_browser_process->local_state()

chrome/browser/extensions/updater/manifest_fetch_data.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/extensions/updater/manifest_fetch_data.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/omaha_query_params/omaha_query_params.h"
 #include "net/base/escape.h"
 
 namespace {
 
 // Maximum length of an extension manifest update check url, since it is a GET
 // request. We want to stay under 2K because of proxies, etc.
 const int kExtensionsManifestMaxURLSize = 2000;
@@ skipping 73 matching lines @@
       parts.push_back("brand=" + brand);
 #endif
 
     std::string ping_value;
     pings_[id] = PingData(0, 0, false);
 
     if (ping_data) {
       if (ping_data->rollcall_days == kNeverPinged ||
           ping_data->rollcall_days > 0) {
         ping_value += "r=" + base::IntToString(ping_data->rollcall_days);
-        if (MetricsServiceHelper::IsMetricsReportingEnabled()) {
+        if (MetricsServiceHelper::IsMetricsReportingEnabled(
+                g_browser_process->local_state())) {
           ping_value += "&e=" + std::string(ping_data->is_enabled ? "1" : "0");
         }
         pings_[id].rollcall_days = ping_data->rollcall_days;
         pings_[id].is_enabled = ping_data->is_enabled;
       }
       if (ping_data->active_days == kNeverPinged ||
           ping_data->active_days > 0) {
         if (!ping_value.empty())
           ping_value += "&";
         ping_value += "a=" + base::IntToString(ping_data->active_days);
@@ skipping 39 matching lines @@
     NOTREACHED();
   return value == kNeverPinged || value > 0;
 }
 
 void ManifestFetchData::Merge(const ManifestFetchData& other) {
   DCHECK(full_url() == other.full_url());
   request_ids_.insert(other.request_ids_.begin(), other.request_ids_.end());
 }
 
 }  // namespace extensions