Relanding this as this did not fix the chromiumos breakage.

chrome/browser/policy/cloud_policy_store.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_CLOUD_POLICY_STORE_H_
 #define CHROME_BROWSER_POLICY_CLOUD_POLICY_STORE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/policy/cloud_policy_validator.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 
+class Profile;
+
 namespace policy {
 
 // Defines the low-level interface used by the cloud policy code to:
 //   1. Validate policy blobs that should be applied locally
 //   2. Persist policy blobs
 //   3. Decode policy blobs to PolicyMap representation
 class CloudPolicyStore {
  public:
   // Status codes.
   enum Status {
@@ skipping 59 matching lines @@
   // the registered observers. Otherwise, OnStoreError() reports the reason for
   // failure.
   virtual void Load() = 0;
 
   // Registers an observer to be notified when policy changes.
   void AddObserver(Observer* observer);
 
   // Removes the specified observer.
   void RemoveObserver(Observer* observer);
 
+  // Factory method to create a CloudPolicyStore appropriate for the current
+  // platform, for storing user policy for the user associated with the passed
+  // |profile|. Implementation is defined in the individual platform store
+  // files.
+  static scoped_ptr<CloudPolicyStore> CreateUserPolicyStore(Profile* profile);
+
  protected:
   // Invokes the corresponding callback on all registered observers.
   void NotifyStoreLoaded();
   void NotifyStoreError();
 
   // Decoded version of the currently effective policy.
   PolicyMap policy_map_;
 
   // Currently effective policy.
   scoped_ptr<enterprise_management::PolicyData> policy_;
@@ skipping 10 matching lines @@
   bool is_initialized_;
 
   ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyStore);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_POLICY_STORE_H_