Refactored the DeviceManagementService to get its parameters from a delegate.

chrome/browser/policy/cloud/device_management_service.cc

Index: chrome/browser/policy/cloud/device_management_service.cc
diff --git a/chrome/browser/policy/cloud/device_management_service.cc b/chrome/browser/policy/cloud/device_management_service.cc
index d003c57c253a64257e1b4aef238c7d13ebbc1957..11a923ccb02c3c69bf2fccc79341d24883be14b6 100644
--- a/chrome/browser/policy/cloud/device_management_service.cc
+++ b/chrome/browser/policy/cloud/device_management_service.cc
@@ -485,7 +485,10 @@ DeviceManagementService::~DeviceManagementService() {
 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) {
@@ -502,8 +505,8 @@ 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()) {
@@ -523,23 +526,17 @@ void DeviceManagementService::Shutdown() {
 }
 
 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;