Abstract BrowserProcess dependency from VariationsService

chrome/browser/metrics/variations/variations_service.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/metrics/variations/variations_service.h"
 
 #include "base/build_time.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/sys_info.h"
 #include "base/task_runner_util.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/values.h"
 #include "base/version.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/variations/generated_resources_map.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/network_time/network_time_tracker.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/variations/pref_names.h"
 #include "components/variations/proto/variations_seed.pb.h"
 #include "components/variations/variations_seed_processor.h"
 #include "components/variations/variations_seed_simulator.h"
@@ skipping 443 matching lines @@
 }
 
 void VariationsService::DoActualFetch() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!pending_seed_request_);
 
   pending_seed_request_ = net::URLFetcher::Create(0, variations_server_url_,
                                                   net::URLFetcher::GET, this);
   pending_seed_request_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                       net::LOAD_DO_NOT_SAVE_COOKIES);
-  pending_seed_request_->SetRequestContext(
-      g_browser_process->system_request_context());
+  pending_seed_request_->SetRequestContext(client_->GetURLRequestContext());
   pending_seed_request_->SetMaxRetriesOn5xx(kMaxRetrySeedFetch);
   if (!seed_store_.variations_serial_number().empty() &&
       !disable_deltas_for_next_request_) {
     // If the current seed includes a country code, deltas are not supported (as
     // the serial number doesn't take into account the country code). The server
     // will update us with a seed that doesn't include a country code which will
     // enable deltas to work.
     // TODO(asvitkine): Remove the check in M50+ when the percentage of clients
     // that have an old seed with a country code becomes miniscule.
     if (!seed_store_.seed_has_country_code()) {
@@ skipping 108 matching lines @@
   const base::TimeDelta latency =
       base::TimeTicks::Now() - last_request_started_time_;
 
   base::Time response_date;
   if (response_code == net::HTTP_OK ||
       response_code == net::HTTP_NOT_MODIFIED) {
     bool success = request->GetResponseHeaders()->GetDateValue(&response_date);
     DCHECK(success || response_date.is_null());
 
     if (!response_date.is_null()) {
-      g_browser_process->network_time_tracker()->UpdateNetworkTime(
+      client_->GetNetworkTimeTracker()->UpdateNetworkTime(
           response_date,
-          base::TimeDelta::FromMilliseconds(kServerTimeResolutionMs),
-          latency,
+          base::TimeDelta::FromMilliseconds(kServerTimeResolutionMs), latency,
           base::TimeTicks::Now());
     }
   }
 
   if (response_code != net::HTTP_OK) {
     DVLOG(1) << "Variations server request returned non-HTTP_OK response code: "
              << response_code;
     if (response_code == net::HTTP_NOT_MODIFIED) {
       RecordLastFetchTime();
       // Update the seed date value in local state (used for expiry check on
@@ skipping 154 matching lines @@
   // Otherwise, update the pref with the current Chrome version and country.
   base::ListValue new_list_value;
   new_list_value.AppendString(version.GetString());
   new_list_value.AppendString(latest_country);
   local_state_->Set(prefs::kVariationsPermanentConsistencyCountry,
                     new_list_value);
   return latest_country;
 }
 
 }  // namespace chrome_variations