Refactored the DeviceManagementService to get its parameters from a delegate.

chrome/browser/policy/cloud/device_management_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_CLOUD_DEVICE_MANAGEMENT_SERVICE_H_
 #define CHROME_BROWSER_POLICY_CLOUD_DEVICE_MANAGEMENT_SERVICE_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 83 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceManagementRequestJob);
 };
 
 // The device management service is responsible for everything related to
 // communication with the device management server. It creates the backends
 // objects that the device management policy provider and friends use to issue
 // requests.
 class DeviceManagementService : public net::URLFetcherDelegate {
  public:
+  // Obtains the parameters used to contact the server.
+  // This allows creating the DeviceManagementService early and getting these
+  // parameters later. Passing the parameters directly in the ctor isn't
+  // possible because some aren't ready during startup. http://crbug.com/302798
+  class Configuration {
+   public:
+    virtual ~Configuration() {}
+
+    // Server at which to contact the service.
+    virtual std::string GetServerUrl() = 0;
+
+    // Value for the User-Agent header.
+    virtual std::string GetUserAgent() = 0;
+
+    // Agent reported in the "agent" query parameter.
+    virtual std::string GetAgentParameter() = 0;
+
+    // The platform reported in the "platform" query parameter.
+    virtual std::string GetPlatformParameter() = 0;
+  };
+
   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);
+      scoped_ptr<Configuration> configuration,
+      scoped_refptr<net::URLRequestContextGetter> request_context);
   virtual ~DeviceManagementService();
 
   // The ID of URLFetchers created by the DeviceManagementService. This can be
   // used by tests that use a TestURLFetcherFactory to get the pending fetchers
   // created by the DeviceManagementService.
   static const int kURLFetcherID;
 
   // Creates a new device management request job. Ownership is transferred to
   // the caller.
   virtual DeviceManagementRequestJob* CreateJob(
@@ skipping 24 matching lines @@
   void StartJob(DeviceManagementRequestJobImpl* job);
 
   // Adds a job. Caller must make sure the job pointer stays valid until the job
   // completes or gets canceled via RemoveJob().
   void AddJob(DeviceManagementRequestJobImpl* job);
 
   // Removes a job. The job will be removed and won't receive a completion
   // callback.
   void RemoveJob(DeviceManagementRequestJobImpl* job);
 
+  // A Configuration implementation that is used to obtain various parameters
+  // used to talk to the device management server.
+  scoped_ptr<Configuration> configuration_;
+
   // The request context is wrapped by the |request_context_getter_|.
   scoped_refptr<net::URLRequestContextGetter> request_context_;
 
-  // Server at which to contact the service.
-  const std::string server_url_;
-
-  // Value for the User-Agent header.
-  const std::string user_agent_;
-
-  // Agent reported in the "agent" query parameter.
-  const std::string agent_parameter_;
-
-  // The platform reported in the "platform" query parameter.
-  const std::string platform_parameter_;
-
   // The request context we use. This is a wrapper of |request_context_|.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
   // The jobs we currently have in flight.
   JobFetcherMap pending_jobs_;
 
   // Jobs that are registered, but not started yet.
   JobQueue queued_jobs_;
 
   // If this service is initialized, incoming requests get fired instantly.
   // If it is not initialized, incoming requests are queued.
   bool initialized_;
 
   // Used to create tasks to run |Initialize| delayed on the UI thread.
   base::WeakPtrFactory<DeviceManagementService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceManagementService);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_DEVICE_MANAGEMENT_SERVICE_H_