Refactored the DeviceManagementService to get its parameters from a delegate.

chrome/browser/policy/cloud/device_management_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/policy/cloud/device_management_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 467 matching lines @@
 
 DeviceManagementService::~DeviceManagementService() {
   // All running jobs should have been cancelled by now.
   DCHECK(pending_jobs_.empty());
   DCHECK(queued_jobs_.empty());
 }
 
 DeviceManagementRequestJob* DeviceManagementService::CreateJob(
     DeviceManagementRequestJob::JobType type) {
   return new DeviceManagementRequestJobImpl(
-      type, agent_parameter_, platform_parameter_, this);
+      type,
+      configuration_->GetAgentParameter(),
+      configuration_->GetPlatformParameter(),
+      this);
 }
 
 void DeviceManagementService::ScheduleInitialization(int64 delay_milliseconds) {
   if (initialized_)
     return;
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DeviceManagementService::Initialize,
                  weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(delay_milliseconds));
 }
 
 void DeviceManagementService::Initialize() {
   if (initialized_)
     return;
   DCHECK(!request_context_getter_.get());
-  request_context_getter_ =
-      new DeviceManagementRequestContextGetter(request_context_, user_agent_);
+  request_context_getter_ = new DeviceManagementRequestContextGetter(
+      request_context_, configuration_->GetUserAgent());
   initialized_ = true;
 
   while (!queued_jobs_.empty()) {
     StartJob(queued_jobs_.front());
     queued_jobs_.pop_front();
   }
 }
 
 void DeviceManagementService::Shutdown() {
   for (JobFetcherMap::iterator job(pending_jobs_.begin());
        job != pending_jobs_.end();
        ++job) {
     delete job->first;
     queued_jobs_.push_back(job->second);
   }
   pending_jobs_.clear();
 }
 
 DeviceManagementService::DeviceManagementService(
-    scoped_refptr<net::URLRequestContextGetter> request_context,
-    const std::string& server_url,
-    const std::string& user_agent,
-    const std::string& agent_parameter,
-    const std::string& platform_parameter)
-    : request_context_(request_context),
-      server_url_(server_url),
-      user_agent_(user_agent),
-      agent_parameter_(agent_parameter),
-      platform_parameter_(platform_parameter),
+    scoped_ptr<Configuration> configuration,
+    scoped_refptr<net::URLRequestContextGetter> request_context)
+    : configuration_(configuration.Pass()),
+      request_context_(request_context),
       initialized_(false),
-      weak_ptr_factory_(this) {
-}
+      weak_ptr_factory_(this) {}

[pastarmovj, 2013/10/02 11:14:10]

I think it makes sense to have a DCHECK(configuration_.get()) here to make sure
the configuration_ object is fine. It will help figure out issues earlier than
if it only crashes once the thing is invoked potentially much later.

[Joao da Silva, 2013/10/02 11:37:40]

Done.

 
 void DeviceManagementService::StartJob(DeviceManagementRequestJobImpl* job) {
+  std::string server_url = configuration_->GetServerUrl();
   net::URLFetcher* fetcher = net::URLFetcher::Create(
-      kURLFetcherID, job->GetURL(server_url_), net::URLFetcher::POST, this);
+      kURLFetcherID, job->GetURL(server_url), net::URLFetcher::POST, this);
   fetcher->SetRequestContext(request_context_getter_.get());
   job->ConfigureRequest(fetcher);
   pending_jobs_[fetcher] = job;
   fetcher->Start();
 }
 
 void DeviceManagementService::OnURLFetchComplete(
     const net::URLFetcher* source) {
   JobFetcherMap::iterator entry(pending_jobs_.find(source));
   if (entry == pending_jobs_.end()) {
@@ skipping 35 matching lines @@
     }
   }
 
   const JobQueue::iterator elem =
       std::find(queued_jobs_.begin(), queued_jobs_.end(), job);
   if (elem != queued_jobs_.end())
     queued_jobs_.erase(elem);
 }
 
 }  // namespace policy