Refactored the DeviceManagementService to get its parameters from a delegate.

chrome/browser/policy/cloud/mock_device_management_service.cc

Index: chrome/browser/policy/cloud/mock_device_management_service.cc
diff --git a/chrome/browser/policy/cloud/mock_device_management_service.cc b/chrome/browser/policy/cloud/mock_device_management_service.cc
index a11306f5b64efe227ae63e5878f960c3e8314d5c..5348bb8651e14e4541274a370951b9d8b766be41 100644
--- a/chrome/browser/policy/cloud/mock_device_management_service.cc
+++ b/chrome/browser/policy/cloud/mock_device_management_service.cc
@@ -16,6 +16,8 @@ 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:
@@ -118,14 +120,38 @@ ACTION_P2(CreateAsyncMockDeviceManagementJob, service, mock_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() {}