Relanding this as this did not fix the chromiumos breakage.

chrome/browser/profiles/profile_impl.h

Index: chrome/browser/profiles/profile_impl.h
===================================================================
--- chrome/browser/profiles/profile_impl.h	(revision 150400)
+++ chrome/browser/profiles/profile_impl.h	(working copy)
@@ -87,6 +87,7 @@
   virtual GAIAInfoUpdateService* GetGAIAInfoUpdateService() OVERRIDE;
   virtual HistoryService* GetHistoryService(ServiceAccessType sat) OVERRIDE;
   virtual HistoryService* GetHistoryServiceWithoutCreating() OVERRIDE;
+  virtual policy::UserCloudPolicyManager* GetUserCloudPolicyManager() OVERRIDE;
   virtual policy::PolicyService* GetPolicyService() OVERRIDE;
   virtual PrefService* GetPrefs() OVERRIDE;
   virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;
@@ -186,9 +187,12 @@
   //  that the declaration occurs AFTER things it depends on as destruction
   //  happens in reverse order of declaration.
 
-  // |prefs_| depends on |policy_service_|.
-  // TODO(bauerb): Once |prefs_| is a ProfileKeyedService, |policy_service_|
-  // should become one as well.
+  // |prefs_| depends on |policy_service_|, which depends on
+  // |user_cloud_policy_manager_|.
+  // TODO(bauerb, mnissler): Once |prefs_| is a ProfileKeyedService,
+  // |policy_service_| and |user_cloud_policy_manager_| should become
+  // ProfiledKeyedServices as well.
+  scoped_ptr<policy::UserCloudPolicyManager> cloud_policy_manager_;
   scoped_ptr<policy::PolicyService> policy_service_;
 
   // Keep |prefs_| on top for destruction order because |extension_prefs_|,
Property changes on: chrome\browser\profiles\profile_impl.h
___________________________________________________________________
Added: svn:mergeinfo