Revert of 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 be518fb5b391dd65260d9ce42cdde083777ef260..668f48d14e654634a88a79e747e7966f97ef72fb 100644
--- a/chrome/browser/metrics/variations/variations_service.h
+++ b/chrome/browser/metrics/variations/variations_service.h
@@ -109,8 +109,8 @@
   // 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.
-  GURL GetVariationsServerURL(PrefService* local_prefs,
-                              const std::string& restrict_mode_override);
+  static GURL GetVariationsServerURL(PrefService* local_prefs,
+                                     const std::string& restrict_mode_override);
 
   // Exposed for testing.
   static std::string GetDefaultVariationsServerURLForTesting();
@@ -130,11 +130,6 @@
       metrics::MetricsStateManager* state_manager,
       const char* disable_network_switch);
 
-  // Factory method for creating a VariationsService in a testing context.
-  static scoped_ptr<VariationsService> CreateForTesting(
-      scoped_ptr<VariationsServiceClient> client,
-      PrefService* local_state);
-
   // Set the PrefService responsible for getting policy-related preferences,
   // such as the restrict parameter.
   void set_policy_pref_service(PrefService* service) {
@@ -161,14 +156,14 @@
                          bool is_delta_compressed);
 
   // Creates the VariationsService with the given |local_state| prefs service
-  // and |state_manager|. Does not take ownership of |state_manager|. Caller
-  // should ensure that |state_manager| is valid for the lifetime of this class.
-  // Use the |Create| factory method to create a VariationsService.
-  VariationsService(
-      scoped_ptr<VariationsServiceClient> client,
-      scoped_ptr<web_resource::ResourceRequestAllowedNotifier> notifier,
-      PrefService* local_state,
-      metrics::MetricsStateManager* state_manager);
+  // and |state_manager|. This instance will take ownership of |notifier|.
+  // Does not take ownership of |state_manager|. Caller should ensure that
+  // |state_manager| is valid for the lifetime of this class. Use the |Create|
+  // factory method to create a VariationsService.
+  VariationsService(scoped_ptr<VariationsServiceClient> client,
+                    web_resource::ResourceRequestAllowedNotifier* notifier,
+                    PrefService* local_state,
+                    metrics::MetricsStateManager* state_manager);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, Observer);