Move user cloud policy to BrowserProcess (was 6979011)

chrome/browser/policy/cloud_policy_controller_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/policy/cloud_policy_controller.h"
 
 #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"
 #include "chrome/browser/policy/mock_configuration_policy_store.h"
 #include "chrome/browser/policy/mock_device_management_backend.h"
 #include "chrome/browser/policy/mock_device_management_service.h"
 #include "chrome/browser/policy/policy_notifier.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "chrome/browser/policy/user_policy_cache.h"
 #include "content/browser/browser_thread.h"
@@ skipping 76 matching lines @@
   }
 
   // Takes ownership of |backend|.
   void CreateNewController() {
     controller_.reset(new CloudPolicyController(
         &service_, cache_.get(), token_fetcher_.get(), &identity_strategy_,
         &notifier_, new DummyWorkScheduler));
   }
 
   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(
       const std::string& device_token,
       const std::string& device_id,
       const std::string& machine_id,
       const std::string& machine_model,
       const std::string& policy_type,
       const em::DeviceRegisterRequest_Type& policy_register_type,
       const std::string& user_name,
@@ skipping 156 matching lines @@
                         "who@what.com", "auth");
   EXPECT_CALL(backend_, ProcessPolicyRequest(_, _, _, _)).WillOnce(
       MockDeviceManagementBackendFailPolicy(
           DeviceManagementBackend::kErrorServiceManagementNotSupported));
   EXPECT_CALL(*token_fetcher_.get(), SetUnmanagedState()).Times(1);
   CreateNewController();
   loop_.RunAllPending();
 }
 
 }  // namespace policy