Turn VariationsService::GetVariationsServerURL into instance method

chrome/browser/metrics/variations/variations_service.h

Index: chrome/browser/metrics/variations/variations_service.h
diff --git a/chrome/browser/metrics/variations/variations_service.h b/chrome/browser/metrics/variations/variations_service.h
index 668f48d14e654634a88a79e747e7966f97ef72fb..21cded4d79d052bd30614b8f7b2a17380d8f7970 100644
--- a/chrome/browser/metrics/variations/variations_service.h
+++ b/chrome/browser/metrics/variations/variations_service.h
@@ -34,6 +34,11 @@ namespace metrics {
 class MetricsStateManager;
 }
 
+namespace policy {
+FORWARD_DECLARE_TEST(PolicyVariationsServiceTest, VariationsURLIsValid);
+FORWARD_DECLARE_TEST(VariationsServiceDevicePolicyTest, VariationsURLValid);
+}
+
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
@@ -109,8 +114,8 @@ class VariationsService
   // Returns the variations server URL, which can vary if a command-line flag is
   // set and/or the variations restrict pref is set in |local_prefs|. Declared
   // static for test purposes.
-  static GURL GetVariationsServerURL(PrefService* local_prefs,
-                                     const std::string& restrict_mode_override);
+  GURL GetVariationsServerURL(PrefService* local_prefs,
+                              const std::string& restrict_mode_override);
 
   // Exposed for testing.
   static std::string GetDefaultVariationsServerURLForTesting();
@@ -173,6 +178,10 @@ class VariationsService
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest,
                            LoadPermanentConsistencyCountry);
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, CountryHeader);
+  FRIEND_TEST_ALL_PREFIXES(policy::PolicyVariationsServiceTest,
+                           VariationsURLIsValid);

[Alexei Svitkine (slow), 2015/08/31 15:03:02]

Hmm, once VariationsService moves to a component, this becomes a layering
violation.

Can we instead add ForTesting() methods to avoid needing to add friends?

[blundell, 2015/09/01 10:03:06]

Done.

+  FRIEND_TEST_ALL_PREFIXES(policy::VariationsServiceDevicePolicyTest,
+                           VariationsURLValid);
 
   // Set of different possible values to report for the
   // Variations.LoadPermanentConsistencyCountryResult histogram. This enum must