Turn VariationsService::GetVariationsServerURL into instance method

chrome/browser/metrics/variations/variations_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_SERVICE_H_
 #define CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_SERVICE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 16 matching lines @@
 class PrefRegistrySimple;
 
 namespace base {
 class Version;
 }
 
 namespace metrics {
 class MetricsStateManager;
 }
 
+namespace policy {
+FORWARD_DECLARE_TEST(PolicyVariationsServiceTest, VariationsURLIsValid);
+FORWARD_DECLARE_TEST(VariationsServiceDevicePolicyTest, VariationsURLValid);
+}
+
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace variations {
 class VariationsSeed;
 }
 
 namespace chrome_variations {
 
@@ skipping 55 matching lines @@
   // value coming from policy prefs. This should be called prior to any calls
   // to |StartRepeatedVariationsSeedFetch|.
   void SetRestrictMode(const std::string& restrict_mode);
 
   // Exposed for testing.
   void SetCreateTrialsFromSeedCalledForTesting(bool called);
 
   // 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();
 
   // Register Variations related prefs in Local State.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Register Variations related prefs in the Profile prefs.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
@@ skipping 42 matching lines @@
                     metrics::MetricsStateManager* state_manager);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, Observer);
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, SeedStoredWhenOKStatus);
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, SeedNotStoredWhenNonOKStatus);
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, SeedDateUpdatedOn304Status);
   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
   // be kept consistent with its counterpart in histograms.xml.
   enum LoadPermanentConsistencyCountryResult {
     LOAD_COUNTRY_NO_PREF_NO_SEED = 0,
     LOAD_COUNTRY_NO_PREF_HAS_SEED,
     LOAD_COUNTRY_INVALID_PREF_NO_SEED,
     LOAD_COUNTRY_INVALID_PREF_HAS_SEED,
     LOAD_COUNTRY_HAS_PREF_NO_SEED_VERSION_EQ,
@@ skipping 98 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<VariationsService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VariationsService);
 };
 
 }  // namespace chrome_variations
 
 #endif  // CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_SERVICE_H_