Turn VariationsService::GetVariationsServerURL into instance method

chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc

 // Copyright (c) 2013 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.
 
 #include "base/strings/string_util.h"
 #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 "components/web_resource/resource_request_allowed_notifier.h"
 #include "net/base/url_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 class VariationsServiceDevicePolicyTest : public DevicePolicyCrosBrowserTest {
  protected:
   VariationsServiceDevicePolicyTest() {}
 
   void SetUpInProcessBrowserTestFixture() override {
@@ skipping 13 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VariationsServiceDevicePolicyTest);
 };
 
 IN_PROC_BROWSER_TEST_F(VariationsServiceDevicePolicyTest, VariationsURLValid) {
   const std::string default_variations_url =
       chrome_variations::VariationsService::
           GetDefaultVariationsServerURLForTesting();
 
+  // g_browser_process->variations_service() is null by default in Chromium
+  // builds, so construct a VariationsService locally instead.
+  chrome_variations::VariationsService service(
+      make_scoped_ptr(new ChromeVariationsServiceClient()),
+      new web_resource::ResourceRequestAllowedNotifier(
+          g_browser_process->local_state(), nullptr),

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

It's pretty weird that with the change to pass in a client to VariationsService,
it takes the client as a scoped ptr but the notifier as a regular pointer, even
though it takes ownership of both.

Could you fix the API to take both by scoped_ptr? (Since you added inconsistency
when adding the client.) Thanks!

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

Done.

+      g_browser_process->local_state(), NULL);

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

nullptr

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

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));
   std::string value;
   EXPECT_TRUE(net::GetValueForKeyInQuery(url, "restrict", &value));
   EXPECT_EQ("restricted", value);
 }
 
 }  // namespace policy