Refactored the DeviceManagementService to get its parameters from a delegate.

chrome/browser/policy/cloud/mock_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/mock_device_management_service.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_test_util.h"
 
 using testing::Action;
 
 namespace em = enterprise_management;
 
 namespace policy {
 namespace {
 
+const char kServerUrl[] = "https://example.com/management_service";
+
 // Common mock request job functionality.
 class MockRequestJobBase : public DeviceManagementRequestJob {
  public:
   MockRequestJobBase(JobType type,
                      MockDeviceManagementService* service)
       : DeviceManagementRequestJob(type, std::string(), std::string()),
         service_(service) {}
   virtual ~MockRequestJobBase() {}
 
  protected:
@@ skipping 82 matching lines @@
 }
 
 ACTION_P2(CreateAsyncMockDeviceManagementJob, service, mock_job) {
   AsyncRequestJob* job = new AsyncRequestJob(arg0, service);
   *mock_job = job;
   return job;
 }
 
 MockDeviceManagementJob::~MockDeviceManagementJob() {}
 
+MockDeviceManagementServiceConfiguration::
+    MockDeviceManagementServiceConfiguration()
+    : server_url_(kServerUrl) {}
+
+MockDeviceManagementServiceConfiguration::
+    MockDeviceManagementServiceConfiguration(const std::string& server_url)
+    : server_url_(server_url) {}
+
+MockDeviceManagementServiceConfiguration::
+    ~MockDeviceManagementServiceConfiguration() {}
+
+std::string MockDeviceManagementServiceConfiguration::GetServerUrl() {
+  return server_url_;
+}
+
+std::string MockDeviceManagementServiceConfiguration::GetUserAgent() {
+  return "Chrome 1.2.3(456)";

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

nit: Can you please move those up to be named constants.

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

Done.

+}
+
+std::string MockDeviceManagementServiceConfiguration::GetAgentParameter() {
+  return GetUserAgent();
+}
+
+std::string MockDeviceManagementServiceConfiguration::GetPlatformParameter() {
+  return "Test|Unit|1.2.3";

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

ditto.

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

Done.

+}
+
 MockDeviceManagementService::MockDeviceManagementService()
-    : DeviceManagementService(
-          new net::TestURLRequestContextGetter(
-              base::MessageLoopProxy::current()),
-          std::string(),
-          std::string(),
-          std::string(),
-          std::string()) {}
+    : DeviceManagementService(scoped_ptr<Configuration>(
+                                  new MockDeviceManagementServiceConfiguration),
+                              new net::TestURLRequestContextGetter(
+                                  base::MessageLoopProxy::current())) {}
 
 MockDeviceManagementService::~MockDeviceManagementService() {}
 
 Action<MockDeviceManagementService::CreateJobFunction>
     MockDeviceManagementService::SucceedJob(
         const em::DeviceManagementResponse& response) {
   return CreateSyncMockDeviceManagementJob(this, DM_STATUS_SUCCESS, response);
 }
 
 Action<MockDeviceManagementService::CreateJobFunction>
     MockDeviceManagementService::FailJob(DeviceManagementStatus status) {
   const em::DeviceManagementResponse dummy_response;
   return CreateSyncMockDeviceManagementJob(this, status, dummy_response);
 }
 
 Action<MockDeviceManagementService::CreateJobFunction>
     MockDeviceManagementService::CreateAsyncJob(MockDeviceManagementJob** job) {
   return CreateAsyncMockDeviceManagementJob(this, job);
 }
 
 }  // namespace policy