Pull g_browser_process out of PopularSites.

chrome/browser/android/ntp/popular_sites.cc

 // Copyright 2015 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/android/ntp/popular_sites.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/ntp_tiles/switches.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/search_engine_type.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/variations/service/variations_service.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
+using variations::VariationsService;
 
 namespace {
 
 const char kPopularSitesURLFormat[] =
     "https://www.gstatic.com/chrome/ntp/suggested_sites_%s_%s.json";
 const char kPopularSitesDefaultCountryCode[] = "DEFAULT";
 const char kPopularSitesDefaultVersion[] = "5";
 const char kPopularSitesLocalFilename[] = "suggested_sites.json";
 const int kPopularSitesRedownloadIntervalHours = 24;
 
@@ skipping 25 matching lines @@
     if (is_google_search_engine) {
       GURL search_url = default_provider->GenerateSearchURL(
           template_url_service->search_terms_data());
       return google_util::GetGoogleCountryCode(search_url);
     }
   }
 
   return std::string();
 }
 
-// Get the country that the experiment is running under
-std::string GetVariationsServiceCountry() {
-  DCHECK(g_browser_process);
-  variations::VariationsService* variations_service =
-      g_browser_process->variations_service();
-  if (variations_service)
-    return variations_service->GetStoredPermanentCountry();
-  return std::string();
-}
-
 // Find out the country code of the user by using the Google country code if
 // Google is the default search engine set. If Google is not the default search
 // engine use the country provided by VariationsService. Fallback to a default
 // if we can't make an educated guess.
 std::string GetCountryToUse(const TemplateURLService* template_url_service,
+                            VariationsService* variations_service,
                             const std::string& override_country) {
   if (!override_country.empty())
     return override_country;
 
   std::string country_code = GetDefaultSearchEngineCountryCode(
       template_url_service);
 
-  if (country_code.empty())
-    country_code = GetVariationsServiceCountry();
+  // Get the country that the experiment is running under
+  if (country_code.empty() && variations_service)
+    country_code = variations_service->GetStoredPermanentCountry();
 
   if (country_code.empty())
     country_code = kPopularSitesDefaultCountryCode;
 
   return base::ToUpperASCII(country_code);
 }
 
 std::string GetVersionToUse(const std::string& override_version) {
   if (!override_version.empty())
     return override_version;
@@ skipping 59 matching lines @@
       favicon_url(favicon_url),
       large_icon_url(large_icon_url),
       thumbnail_url(thumbnail_url) {}
 
 PopularSites::Site::Site(const Site& other) = default;
 
 PopularSites::Site::~Site() {}
 
 PopularSites::PopularSites(PrefService* prefs,
                            const TemplateURLService* template_url_service,
+                           VariationsService* variations_service,
                            net::URLRequestContextGetter* download_context,
                            const std::string& override_country,
                            const std::string& override_version,
                            bool force_download,
                            const FinishedCallback& callback)
     : PopularSites(prefs,
                    template_url_service,
                    download_context,
-                   GetCountryToUse(template_url_service, override_country),
+                   GetCountryToUse(template_url_service,
+                                   variations_service,
+                                   override_country),
                    GetVersionToUse(override_version),
                    GURL(),
                    force_download,
                    callback) {}
 
 PopularSites::PopularSites(PrefService* prefs,
                            const TemplateURLService* template_url_service,
                            net::URLRequestContextGetter* download_context,
                            const GURL& url,
                            const FinishedCallback& callback)
@@ skipping 115 matching lines @@
       base::Bind(&PopularSites::OnJsonParsed, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void PopularSites::OnJsonParsed(std::unique_ptr<std::vector<Site>> sites) {
   if (sites)
     sites_.swap(*sites);
   else
     sites_.clear();
   callback_.Run(!!sites);
 }