Turn VariationsService::GetVariationsServerURL into instance method

chrome/browser/policy/policy_browsertest.cc

Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 9b2ee7c1456e4b41d383229d687fc0bcf8c81d02..f84c9d04ffc22a5ac5f0b6f791cecef8673b1c7c 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -48,6 +48,7 @@
 #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
+#include "chrome/browser/metrics/variations/chrome_variations_service_client.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/net/url_request_mock_util.h"
@@ -3774,9 +3775,15 @@ IN_PROC_BROWSER_TEST_F(PolicyVariationsServiceTest, VariationsURLIsValid) {
       chrome_variations::VariationsService::
           GetDefaultVariationsServerURLForTesting();
 
-  const GURL url =
-      chrome_variations::VariationsService::GetVariationsServerURL(
-          g_browser_process->local_state(), std::string());
+  // g_browser_process->variations_service() is null by default in Chromium
+  // builds, so construct a VariationsService locally instead.
+  scoped_ptr<chrome_variations::VariationsService> service =

[bartfab (slow), 2015/09/02 09:57:29]

Nit: #include "base/memory/scoped_ptr.h"

[blundell, 2015/09/02 10:02:18]

Done.

+      chrome_variations::VariationsService::CreateForTesting(
+          make_scoped_ptr(new ChromeVariationsServiceClient()),
+          g_browser_process->local_state());
+
+  const GURL url = service->GetVariationsServerURL(
+      g_browser_process->local_state(), std::string());
   EXPECT_TRUE(base::StartsWith(url.spec(), default_variations_url,
                                base::CompareCase::SENSITIVE));
   std::string value;