Move user cloud policy to BrowserProcess (was 6979011)

chrome/browser/policy/cloud_policy_controller_unittest.cc

Index: chrome/browser/policy/cloud_policy_controller_unittest.cc
diff --git a/chrome/browser/policy/cloud_policy_controller_unittest.cc b/chrome/browser/policy/cloud_policy_controller_unittest.cc
index a008a1e99c21449fb5c2f9e6b8513afd75333405..ae4e7f317943e0ecba2281a13835ecd58c926cfc 100644
--- a/chrome/browser/policy/cloud_policy_controller_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_controller_unittest.cc
@@ -6,6 +6,8 @@
 
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.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 still needed?

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

Done.

 #include "chrome/browser/policy/device_management_service.h"
 #include "chrome/browser/policy/device_token_fetcher.h"
 #include "chrome/browser/policy/logging_work_scheduler.h"
@@ -102,12 +104,10 @@ class CloudPolicyControllerTest : public testing::Test {
   }
 
   void ExpectHasSpdyPolicy() {
-    MockConfigurationPolicyStore store;
-    EXPECT_CALL(store, Apply(_, _)).Times(AtLeast(1));
-    cache_->GetManagedPolicyProvider()->Provide(&store);
     FundamentalValue expected(true);
-    ASSERT_TRUE(store.Get(kPolicyDisableSpdy) != NULL);
-    EXPECT_TRUE(store.Get(kPolicyDisableSpdy)->Equals(&expected));
+    const PolicyMap* policy_map = cache_->policy(
+        CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY);
+    ASSERT_TRUE(Value::Equals(&expected, policy_map->Get(kPolicyDisableSpdy)));
   }
 
   void SetupIdentityStrategy(