Move user cloud policy to BrowserProcess.

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.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/device_management_service.h"
 #include "chrome/browser/policy/device_token_fetcher.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"
 #include "policy/policy_constants.h"
@@ skipping 59 matching lines @@
   CloudPolicyControllerTest()
       : ui_thread_(BrowserThread::UI, &loop_),
         file_thread_(BrowserThread::FILE, &loop_) {}
 
   virtual ~CloudPolicyControllerTest() {}
 
   virtual void SetUp() {
     ASSERT_TRUE(temp_user_data_dir_.CreateUniqueTempDir());
     cache_.reset(new UserPolicyCache(
         temp_user_data_dir_.path().AppendASCII("CloudPolicyControllerTest")));
+    mandatory_cloud_provider_.reset(new CloudPolicyProvider(
+        policy::ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
+        CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY));
+    recommended_cloud_provider_.reset(new CloudPolicyProvider(
+        policy::ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
+        CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED));
+    mandatory_cloud_provider_->AppendCache(cache_.get());
+    recommended_cloud_provider_->AppendCache(cache_.get());
     token_fetcher_.reset(new MockDeviceTokenFetcher(cache_.get()));
     service_.set_backend(&backend_);
   }
 
   virtual void TearDown() {
     controller_.reset();  // Unregisters observers.
   }
 
   // Takes ownership of |backend|.
   void CreateNewController() {
@@ skipping 11 matching lines @@
         &notifier_,
         policy_refresh_rate_ms,
         policy_refresh_deviation_factor_percent,
         policy_refresh_deviation_max_ms,
         policy_refresh_error_delay_ms));
   }
 
   void ExpectHasSpdyPolicy() {
     MockConfigurationPolicyStore store;
     EXPECT_CALL(store, Apply(_, _)).Times(AtLeast(1));
-    cache_->GetManagedPolicyProvider()->Provide(&store);
+    mandatory_cloud_provider_.get()->Provide(&store);

[Mattias Nissler (ping if slow), 2011/06/09 14:36:26]

Why can't we just check the policy map directly now that we can just access it?
It seems like we should remove the CloudPolicyProvider instances from this test,
since it is not subject of this test.

[sfeuz, 2011/06/13 06:53:53]

Done.

     FundamentalValue expected(true);
     ASSERT_TRUE(store.Get(kPolicyDisableSpdy) != NULL);
     EXPECT_TRUE(store.Get(kPolicyDisableSpdy)->Equals(&expected));
   }
 
   void SetupIdentityStrategy(
       const std::string& device_token,
       const std::string& device_id,
       const std::string& machine_id,
       const std::string& machine_model,
@@ skipping 14 matching lines @@
     EXPECT_CALL(identity_strategy_, GetPolicyRegisterType()).WillRepeatedly(
         Return(policy_register_type));
     if (!user_name.empty()) {
       EXPECT_CALL(identity_strategy_, GetCredentials(_, _)).WillRepeatedly(
           MockCloudPolicyIdentityStrategyGetCredentials(user_name, auth_token));
     }
   }
 
  protected:
   scoped_ptr<CloudPolicyCacheBase> cache_;
+  scoped_ptr<CloudPolicyProvider> recommended_cloud_provider_;
+  scoped_ptr<CloudPolicyProvider> mandatory_cloud_provider_;
   scoped_ptr<CloudPolicyController> controller_;
   scoped_ptr<MockDeviceTokenFetcher> token_fetcher_;
   MockCloudPolicyIdentityStrategy identity_strategy_;
   MockDeviceManagementBackend backend_;
   MockDeviceManagementService service_;
   PolicyNotifier notifier_;
   ScopedTempDir temp_user_data_dir_;
   MessageLoop loop_;
 
  private:
@@ skipping 109 matching lines @@
                         "who@what.com", "auth");
   EXPECT_CALL(backend_, ProcessPolicyRequest(_, _, _, _)).WillOnce(
       MockDeviceManagementBackendFailPolicy(
           DeviceManagementBackend::kErrorServiceManagementNotSupported));
   EXPECT_CALL(*token_fetcher_.get(), SetUnmanagedState()).Times(1);
   CreateNewController(0, 0, 0, 1000 * 1000);
   loop_.RunAllPending();
 }
 
 }  // namespace policy