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

chrome/browser/policy/user_cloud_policy_store_chromeos.h

Index: chrome/browser/policy/user_cloud_policy_store_chromeos.h
===================================================================
--- chrome/browser/policy/user_cloud_policy_store_chromeos.h	(revision 150390)
+++ chrome/browser/policy/user_cloud_policy_store_chromeos.h	(working copy)
@@ -12,8 +12,8 @@
 #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;
@@ -34,7 +34,7 @@
 // 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,
@@ -62,6 +62,11 @@
   // 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,