Move user cloud policy to BrowserProcess (was 6979011)

chrome/browser/policy/cloud_policy_subsystem_unittest.cc

Index: chrome/browser/policy/cloud_policy_subsystem_unittest.cc
diff --git a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
index a8c0ffe915a817a7a8c30909329be1d4cd1d8378..a1a1fd8bbb66cc97df10f0186826874e5466afbc 100644
--- a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
@@ -9,6 +9,8 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/cloud_policy_identity_strategy.h"
+#include "chrome/browser/policy/cloud_policy_provider_impl.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"

[Mattias Nissler (ping if slow), 2011/06/24 09:16:46]

are these includes needed?

[gfeher, 2011/06/24 15:32:44]

Done.

 #include "chrome/browser/policy/logging_work_scheduler.h"
 #include "chrome/browser/policy/mock_configuration_policy_store.h"
 #include "chrome/browser/policy/proto/cloud_policy.pb.h"
@@ -150,10 +152,9 @@ class CloudPolicySubsystemTest : public testing::Test {
 
   // Verifies for a given policy that it is provided by the subsystem.
   void VerifyPolicy(enum ConfigurationPolicyType type, Value* expected) {
-    MockConfigurationPolicyStore store;
-    EXPECT_CALL(store, Apply(_, _)).Times(AtLeast(1));
-    cache_->GetManagedPolicyProvider()->Provide(&store);
-    ASSERT_TRUE(Value::Equals(expected, store.Get(type)));
+    const PolicyMap* policy_map = cache_->policy(
+        CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY);
+    ASSERT_TRUE(Value::Equals(expected, policy_map->Get(type)));
   }
 
   // Verifies that the last recorded run of the subsystem did not issue