Relanding this as this did not fix the chromiumos breakage.

chrome/browser/profiles/profile.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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_H_
 
 #include <string>
@@ skipping 47 matching lines @@
 namespace extensions {
 class EventRouter;
 class UserScriptMaster;
 }
 
 namespace fileapi {
 class FileSystemContext;
 }
 
 namespace history {
+class ShortcutsBackend;
 class TopSites;
-class ShortcutsBackend;
 }
 
 namespace net {
 class SSLConfigService;
 }
 
 namespace policy {
 class PolicyService;
+class UserCloudPolicyManager;
 }
 
 class Profile : public content::BrowserContext {
  public:
   // Profile services are accessed with the following parameter. This parameter
   // defines what the caller plans to do with the service.
   // The caller is responsible for not performing any operation that would
   // result in persistent implicit records while using an OffTheRecord profile.
   // This flag allows the profile to perform an additional check.
   //
@@ skipping 154 matching lines @@
   // process may decide to shut down).
   //
   // |access| defines what the caller plans to do with the service. See
   // the ServiceAccessType definition above.
   virtual HistoryService* GetHistoryService(ServiceAccessType access) = 0;
 
   // Similar to GetHistoryService(), but won't create the history service if it
   // 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;
 
   // Retrieves a pointer to the PrefService that manages the preferences
   // for this user profile.
   virtual PrefService* GetPrefs() = 0;
 
   // Retrieves a pointer to the PrefService that manages the preferences
   // for OffTheRecord Profiles.  This PrefService is lazily created the first
   // time that this method is called.
@@ skipping 170 matching lines @@
 struct hash<Profile*> {
   std::size_t operator()(Profile* const& p) const {
     return reinterpret_cast<std::size_t>(p);
   }
 };
 
 }  // namespace BASE_HASH_NAMESPACE
 #endif
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_H_