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

chrome/browser/policy/user_cloud_policy_store_chromeos.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_USER_CLOUD_POLICY_STORE_CHROMEOS_H_
 #define CHROME_BROWSER_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "chrome/browser/policy/cloud_policy_store.h"
 #include "chrome/browser/policy/cloud_policy_validator.h"
-#include "chrome/browser/policy/user_cloud_policy_store_base.h"
 
 namespace chromeos {
 class SessionManagerClient;
 }
 
 namespace enterprise_management {
 class CloudPolicySettings;
 }
 
 namespace policy {
 
 class LegacyPolicyCacheLoader;
 
 // Implements a cloud policy store backed by the Chrome OS' session_manager,
 // which takes care of persisting policy to disk and is accessed via DBus calls
 // through SessionManagerClient.
 //
 // Additionally, this class drives legacy UserPolicyTokenCache and
 // UserPolicyDiskCache instances, migrating policy from these to session_manager
 // storage on the fly.
-class UserCloudPolicyStoreChromeOS : public UserCloudPolicyStoreBase {
+class UserCloudPolicyStoreChromeOS : public CloudPolicyStore {
  public:
   UserCloudPolicyStoreChromeOS(
       chromeos::SessionManagerClient* session_manager_client,
       const FilePath& legacy_token_cache_file,
       const FilePath& legacy_policy_cache_file);
   virtual ~UserCloudPolicyStoreChromeOS();
 
   // CloudPolicyStore:
   virtual void Store(
       const enterprise_management::PolicyFetchResponse& policy) OVERRIDE;
   virtual void Load() OVERRIDE;
 
  private:
   // Called back from SessionManagerClient for policy load operations.
   void OnPolicyRetrieved(const std::string& policy_blob);
 
   // Completion handler for policy validation on the Load() path. Installs the
   // policy and publishes it if validation succeeded.
   void OnRetrievedPolicyValidated(UserCloudPolicyValidator* validator);
 
   // Completion handler for policy validation on the Load() path. Starts a store
   // operation if the validation succeeded.
   void OnPolicyToStoreValidated(UserCloudPolicyValidator* validator);
 
   // Called back from SessionManagerClient for policy store operations.
   void OnPolicyStored(bool);
 
+  // Installs |policy_data| and |payload|.
+  void InstallPolicy(
+      scoped_ptr<enterprise_management::PolicyData> policy_data,
+      scoped_ptr<enterprise_management::CloudPolicySettings> payload);
+
   // Starts policy blob validation.
   void Validate(
       scoped_ptr<enterprise_management::PolicyFetchResponse> policy,
       const UserCloudPolicyValidator::CompletionCallback& callback);
 
   // Callback for loading legacy caches.
   void OnLegacyLoadFinished(
       const std::string& dm_token,
       const std::string& device_id,
       Status status,
@@ skipping 20 matching lines @@
   FilePath legacy_cache_dir_;
   scoped_ptr<LegacyPolicyCacheLoader> legacy_loader_;
   bool legacy_caches_loaded_;
 
   DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStoreChromeOS);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_