Relanding this as this did not fix the chromiumos breakage.

chrome/browser/policy/browser_policy_connector.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_BROWSER_POLICY_CONNECTOR_H_
 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 30 matching lines @@
   // Builds an uninitialized BrowserPolicyConnector, suitable for testing.
   // Init() should be called to create and start the policy machinery.
   BrowserPolicyConnector();
   virtual ~BrowserPolicyConnector();
 
   // Creates the policy providers and finalizes the initialization of the
   // connector. This call can be skipped on tests that don't require the full
   // policy system running.
   void Init();
 
+  // Creates a UserCloudPolicyManager for the given profile, or returns NULL if
+  // it is not supported on this platform. Ownership is transferred to the
+  // caller.
+  scoped_ptr<UserCloudPolicyManager> CreateCloudPolicyManager(Profile* profile);
+
   // Creates a new policy service for the given profile, or a global one if
   // it is NULL. Ownership is transferred to the caller.
-  PolicyService* CreatePolicyService(Profile* profile);
+  scoped_ptr<PolicyService> CreatePolicyService(Profile* profile);
 
   // Returns a weak pointer to the CloudPolicySubsystem corresponding to the
   // device policy managed by this policy connector, or NULL if no such
   // subsystem exists (i.e. when running outside ChromeOS).
   CloudPolicySubsystem* device_cloud_policy_subsystem() {
 #if defined(OS_CHROMEOS)
     return device_cloud_policy_subsystem_.get();
 #else
     return NULL;
 #endif
@@ skipping 69 matching lines @@
   CloudPolicyDataStore* GetUserCloudPolicyDataStore();
 
   const ConfigurationPolicyHandlerList* GetHandlerList() const;
 
   // Works out the user affiliation by checking the given |user_name| against
   // the installation attributes.
   UserAffiliation GetUserAffiliation(const std::string& user_name);
 
   AppPackUpdater* GetAppPackUpdater();
 
+  DeviceManagementService* device_management_service() {
+    return device_management_service_.get();
+  }
+
   // Sets a |provider| that will be included in PolicyServices returned by
   // CreatePolicyService. This is a static method because local state is
   // created immediately after the connector, and tests don't have a chance to
   // inject the provider otherwise. |provider| must outlive the connector, and
   // its ownership is not taken.
   static void SetPolicyProviderForTesting(
       ConfigurationPolicyProvider* provider);
 
+  // Gets the URL of the DM server (either the default or a URL provided via the
+  // command line).
+  static std::string GetDeviceManagementUrl();
+
  private:
   // content::NotificationObserver method overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Initializes the device cloud policy infrasturcture.
   void InitializeDevicePolicy();
 
   // Complete initialization once the message loops are running and the
@@ skipping 22 matching lines @@
   scoped_ptr<UserPolicyTokenCache> user_policy_token_cache_;
   scoped_ptr<CloudPolicyDataStore> user_data_store_;
   scoped_ptr<CloudPolicySubsystem> user_cloud_policy_subsystem_;
 
   // Components of the new-style cloud policy implementation.
   // TODO(mnissler): Remove the old-style components above once we have
   // completed the switch to the new cloud policy implementation.
   scoped_ptr<DeviceManagementService> device_management_service_;
 
   ProxyPolicyProvider user_cloud_policy_provider_;
-  scoped_ptr<UserCloudPolicyManager> user_cloud_policy_manager_;
 
   // Used to initialize the device policy subsystem once the message loops
   // are spinning.
   base::WeakPtrFactory<BrowserPolicyConnector> weak_ptr_factory_;
 
   // Registers the provider for notification of successful Gaia logins.
   content::NotificationRegistrar registrar_;
 
   // Weak reference to the TokenService we are listening to for user cloud
   // policy authentication tokens.
   TokenService* token_service_;
 
 #if defined(OS_CHROMEOS)
   scoped_ptr<AppPackUpdater> app_pack_updater_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_