Revert of Turn VariationsService::GetVariationsServerURL into instance method

chrome/browser/metrics/variations/variations_service.cc

 // 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.
 
 #include "chrome/browser/metrics/variations/variations_service.h"
 
 #include "base/build_time.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
@@ skipping 192 matching lines @@
                            const base::StringPiece& name) {
   std::string value;
   headers->EnumerateHeader(NULL, name, &value);
   return value;
 }
 
 }  // namespace
 
 VariationsService::VariationsService(
     scoped_ptr<VariationsServiceClient> client,
-    scoped_ptr<web_resource::ResourceRequestAllowedNotifier> notifier,
+    web_resource::ResourceRequestAllowedNotifier* notifier,
     PrefService* local_state,
     metrics::MetricsStateManager* state_manager)
     : client_(client.Pass()),
       local_state_(local_state),
       state_manager_(state_manager),
       policy_pref_service_(local_state),
       seed_store_(local_state),
       create_trials_from_seed_called_(false),
       initial_request_completed_(false),
       disable_deltas_for_next_request_(false),
-      resource_request_allowed_notifier_(notifier.Pass()),
+      resource_request_allowed_notifier_(notifier),
       request_count_(0),
       weak_ptr_factory_(this) {
   resource_request_allowed_notifier_->Init(this);
 }
 
 VariationsService::~VariationsService() {
 }
 
 bool VariationsService::CreateTrialsFromSeed() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 123 matching lines @@
   // This should be called before the server URL has been computed.
   DCHECK(variations_server_url_.is_empty());
   restrict_mode_ = restrict_mode;
 }
 
 void VariationsService::SetCreateTrialsFromSeedCalledForTesting(bool called) {
   DCHECK(thread_checker_.CalledOnValidThread());
   create_trials_from_seed_called_ = called;
 }
 
+// static
 GURL VariationsService::GetVariationsServerURL(
     PrefService* policy_pref_service,
     const std::string& restrict_mode_override) {
   std::string server_url_string(
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kVariationsServerURL));
   if (server_url_string.empty())
     server_url_string = kDefaultServerUrl;
   GURL server_url = GURL(server_url_string);
 
@@ skipping 50 matching lines @@
   // Unless the URL was provided, unsupported builds should return NULL to
   // indicate that the service should not be used.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kVariationsServerURL)) {
     DVLOG(1) << "Not creating VariationsService in unofficial build without --"
              << switches::kVariationsServerURL << " specified.";
     return result.Pass();
   }
 #endif
   result.reset(new VariationsService(
-      client.Pass(),
-      make_scoped_ptr(new web_resource::ResourceRequestAllowedNotifier(
-          local_state, disable_network_switch)),
+      client.Pass(), new web_resource::ResourceRequestAllowedNotifier(
+                         local_state, disable_network_switch),
       local_state, state_manager));
   return result.Pass();
 }
 
-// static
-scoped_ptr<VariationsService> VariationsService::CreateForTesting(
-    scoped_ptr<VariationsServiceClient> client,
-    PrefService* local_state) {
-  return Create(client.Pass(), local_state, nullptr, nullptr);
-}
-
 void VariationsService::DoActualFetch() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!pending_seed_request_);
 
   pending_seed_request_ = net::URLFetcher::Create(0, variations_server_url_,
                                                   net::URLFetcher::GET, this);
   pending_seed_request_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                       net::LOAD_DO_NOT_SAVE_COOKIES);
   pending_seed_request_->SetRequestContext(client_->GetURLRequestContext());
   pending_seed_request_->SetMaxRetriesOn5xx(kMaxRetrySeedFetch);
@@ skipping 293 matching lines @@
   // Otherwise, update the pref with the current Chrome version and country.
   base::ListValue new_list_value;
   new_list_value.AppendString(version.GetString());
   new_list_value.AppendString(latest_country);
   local_state_->Set(prefs::kVariationsPermanentConsistencyCountry,
                     new_list_value);
   return latest_country;
 }
 
 }  // namespace chrome_variations