Pull g_browser_process out of PopularSites.

chrome/browser/android/ntp/popular_sites.h

Index: chrome/browser/android/ntp/popular_sites.h
diff --git a/chrome/browser/android/ntp/popular_sites.h b/chrome/browser/android/ntp/popular_sites.h
index 41523c5bd93ae331b78987f29bc9589b05022628..1e81b815643d9089b2847a798027bbc0b6148554 100644
--- a/chrome/browser/android/ntp/popular_sites.h
+++ b/chrome/browser/android/ntp/popular_sites.h
@@ -25,6 +25,10 @@ namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
+namespace variations {
+class VariationsService;
+}
+
 class PrefService;
 class TemplateURLService;
 
@@ -59,6 +63,7 @@ class PopularSites {
   // if it already exists on disk.
   PopularSites(PrefService* prefs,
                const TemplateURLService* template_url_service,
+               variations::VariationsService* variations_service,

[Alexei Svitkine (slow), 2016/04/29 14:56:09]

Have you considered just plumbing the country code from variations service
instead of the full service?

[Marc Treib, 2016/04/29 14:59:19]

Can the country code ever change during runtime? If not, then this seems like a
good idea.

[Alexei Svitkine (slow), 2016/04/29 15:03:02]

It can change when a new variations seed is fetched *if* it's initially empty.
But otherwise, it gets cached for the current Chrome version, so since the
version doesn't change during runtime, it shouldn't change.

[sfiera, 2016/04/29 15:10:42]

I wouldn't really like to have variations_country and override_country as
separate string arguments to the constructor.

I think my favored option would be to have a separate function
"GetPopularSitesCountryCode(profile)", so that we can take a single country code
and use it unconditionally. That function can stay outside components and depend
on chrome to make it convenient.

[Marc Treib, 2016/04/29 15:15:01]

SGTM.
If we ever want to support iOS, we'll need two implementations of that function,
but that's probably unavoidable anyway.

                net::URLRequestContextGetter* download_context,
                const std::string& override_country,
                const std::string& override_version,