Turn VariationsService::GetVariationsServerURL into instance method

chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc

Index: chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
index a997ec94fce13fa7dbe37d9cee4f906880d7746a..a25d405406f92d4a8945fb7069f8736451e6ab6d 100644
--- a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
@@ -6,6 +6,7 @@
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
+#include "chrome/browser/metrics/variations/chrome_variations_service_client.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "net/base/url_util.h"
@@ -41,8 +42,15 @@ IN_PROC_BROWSER_TEST_F(VariationsServiceDevicePolicyTest, VariationsURLValid) {
       chrome_variations::VariationsService::
           GetDefaultVariationsServerURLForTesting();
 
+  // 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());

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

Nit: #include "chrome/browser/browser_process.h"

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

Done.

+
   // Device policy has updated the cros settings.
-  const GURL url = chrome_variations::VariationsService::GetVariationsServerURL(
+  const GURL url = service->GetVariationsServerURL(
       g_browser_process->local_state(), std::string());
   EXPECT_TRUE(base::StartsWith(url.spec(), default_variations_url,
                                base::CompareCase::SENSITIVE));