Reverting this as it causes browser tests on the Linux ChromiumOS builder to fail.

chrome/browser/policy/browser_policy_connector.h

Index: chrome/browser/policy/browser_policy_connector.h
===================================================================
--- chrome/browser/policy/browser_policy_connector.h	(revision 150390)
+++ chrome/browser/policy/browser_policy_connector.h	(working copy)
@@ -48,14 +48,9 @@
   // 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.
-  scoped_ptr<PolicyService> CreatePolicyService(Profile* profile);
+  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
@@ -145,10 +140,6 @@
 
   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
@@ -157,10 +148,6 @@
   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,
@@ -203,6 +190,7 @@
   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.