Revert of 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 91 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.
-  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();
 
   // 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);
 
   // Factory method for creating a VariationsService. Does not take ownership of
   // |state_manager|. Caller should ensure that |state_manager| is valid for the
   // lifetime of this class.
   static scoped_ptr<VariationsService> Create(
       scoped_ptr<VariationsServiceClient> client,
       PrefService* local_state,
       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) {
     DCHECK(service);
     policy_pref_service_ = service;
   }
 
   // Returns the invalid variations seed signature in base64 format, or an empty
   // string if the signature was valid, missing, or if signature verification is
   // disabled.
   std::string GetInvalidVariationsSeedSignature() const;
 
  protected:
   // Starts the fetching process once, where |OnURLFetchComplete| is called with
   // the response.
   virtual void DoActualFetch();
 
   // Stores the seed to prefs. Set as virtual and protected so that it can be
   // overridden by tests.
   virtual bool StoreSeed(const std::string& seed_data,
                          const std::string& seed_signature,
                          const std::string& country_code,
                          const base::Time& date_fetched,
                          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);
   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);
 
@@ skipping 107 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_