Relanding this as this did not fix the chromiumos breakage.

chrome/browser/profiles/profile.h

Index: chrome/browser/profiles/profile.h
===================================================================
--- chrome/browser/profiles/profile.h	(revision 150400)
+++ chrome/browser/profiles/profile.h	(working copy)
@@ -65,8 +65,8 @@
 }
 
 namespace history {
+class ShortcutsBackend;
 class TopSites;
-class ShortcutsBackend;
 }
 
 namespace net {
@@ -75,6 +75,7 @@
 
 namespace policy {
 class PolicyService;
+class UserCloudPolicyManager;
 }
 
 class Profile : public content::BrowserContext {
@@ -249,6 +250,10 @@
   // doesn't already exist.
   virtual HistoryService* GetHistoryServiceWithoutCreating() = 0;
 
+  // Returns the UserCloudPolicyManager (if any) that handles this profile's
+  // connection to the cloud-based management service.
+  virtual policy::UserCloudPolicyManager* GetUserCloudPolicyManager() = 0;
+
   // Returns the PolicyService that provides policies for this profile.
   virtual policy::PolicyService* GetPolicyService() = 0;
 
Property changes on: chrome\browser\profiles\profile.h
___________________________________________________________________
Added: svn:mergeinfo