Updated SessionManagerClient to use the multi-profile user policy calls.

chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

 // Copyright (c) 2012 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/chromeos/policy/user_cloud_policy_store_chromeos.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 84 matching lines @@
                 OnStoreError(AllOf(Eq(store_.get()),
                                    Property(&CloudPolicyStore::status,
                                             Eq(error)))));
   }
 
   // Triggers a store_->Load() operation, handles the expected call to
   // |session_manager_client_| and sends |response|.
   void PerformPolicyLoad(const std::string& response) {
     // Issue a load command.
     chromeos::SessionManagerClient::RetrievePolicyCallback retrieve_callback;
-    EXPECT_CALL(session_manager_client_, RetrieveUserPolicy(_))
-        .WillOnce(SaveArg<0>(&retrieve_callback));
+    EXPECT_CALL(session_manager_client_,
+                RetrievePolicyForUser(PolicyBuilder::kFakeUsername, _))
+        .WillOnce(SaveArg<1>(&retrieve_callback));
     store_->Load();
     RunUntilIdle();
     Mock::VerifyAndClearExpectations(&session_manager_client_);
     ASSERT_FALSE(retrieve_callback.is_null());
 
     // Run the callback.
     retrieve_callback.Run(response);
     RunUntilIdle();
   }
 
@@ skipping 19 matching lines @@
   // If |new_public_key| is set then it will be persisted after storing but
   // before loading the policy, so that the signature validation can succeed.
   // If |previous_value| is set then a previously existing policy with that
   // value will be expected; otherwise no previous policy is expected.
   // If |new_value| is set then a new policy with that value is expected after
   // storing the |policy_| blob.
   void PerformStorePolicy(const std::vector<uint8>* new_public_key,
                           const char* previous_value,
                           const char* new_value) {
     chromeos::SessionManagerClient::StorePolicyCallback store_callback;
-    EXPECT_CALL(session_manager_client_, StoreUserPolicy(policy_.GetBlob(), _))
-        .WillOnce(SaveArg<1>(&store_callback));
+    EXPECT_CALL(session_manager_client_,
+                StorePolicyForUser(PolicyBuilder::kFakeUsername,
+                                   policy_.GetBlob(), _, _))
+        .WillOnce(SaveArg<3>(&store_callback));
     store_->Store(policy_.policy());
     RunUntilIdle();
     Mock::VerifyAndClearExpectations(&session_manager_client_);
     ASSERT_FALSE(store_callback.is_null());
 
     // The new policy shouldn't be present yet.
     PolicyMap previous_policy;
     EXPECT_EQ(previous_value != NULL, store_->policy() != NULL);
     if (previous_value) {
       previous_policy.Set(key::kHomepageLocation,
                           POLICY_LEVEL_MANDATORY,
                           POLICY_SCOPE_USER,
                           base::Value::CreateStringValue(previous_value));
     }
     EXPECT_TRUE(previous_policy.Equals(store_->policy_map()));
     EXPECT_EQ(CloudPolicyStore::STATUS_OK, store_->status());
 
     // Store the new public key so that the validation after the retrieve
     // operation completes can verify the signature.
     if (new_public_key)
       StoreUserPolicyKey(*new_public_key);
 
     // Let the store operation complete.
     chromeos::SessionManagerClient::RetrievePolicyCallback retrieve_callback;
-    EXPECT_CALL(session_manager_client_, RetrieveUserPolicy(_))
-        .WillOnce(SaveArg<0>(&retrieve_callback));
+    EXPECT_CALL(session_manager_client_,
+                RetrievePolicyForUser(PolicyBuilder::kFakeUsername, _))
+        .WillOnce(SaveArg<1>(&retrieve_callback));
     store_callback.Run(true);
     RunUntilIdle();
     EXPECT_TRUE(previous_policy.Equals(store_->policy_map()));
     EXPECT_EQ(CloudPolicyStore::STATUS_OK, store_->status());
     Mock::VerifyAndClearExpectations(&session_manager_client_);
     ASSERT_FALSE(retrieve_callback.is_null());
 
     // Finish the retrieve callback.
     EXPECT_CALL(observer_, OnStoreLoaded(store_.get()));
     retrieve_callback.Run(policy_.GetBlob());
@@ skipping 72 matching lines @@
   policy_.Build();
   std::vector<uint8> new_public_key;
   ASSERT_TRUE(policy_.new_signing_key()->ExportPublicKey(&new_public_key));
   ASSERT_NO_FATAL_FAILURE(
       PerformStorePolicy(&new_public_key, NULL, kDefaultHomepage));
 }
 
 TEST_F(UserCloudPolicyStoreChromeOSTest, StoreFail) {
   // Store policy.
   chromeos::SessionManagerClient::StorePolicyCallback store_callback;
-  EXPECT_CALL(session_manager_client_, StoreUserPolicy(policy_.GetBlob(), _))
-      .WillOnce(SaveArg<1>(&store_callback));
+  EXPECT_CALL(session_manager_client_,
+              StorePolicyForUser(PolicyBuilder::kFakeUsername,
+                                 policy_.GetBlob(), _, _))
+      .WillOnce(SaveArg<3>(&store_callback));
   store_->Store(policy_.policy());
   RunUntilIdle();
   Mock::VerifyAndClearExpectations(&session_manager_client_);
   ASSERT_FALSE(store_callback.is_null());
 
   // Let the store operation complete.
   ExpectError(CloudPolicyStore::STATUS_STORE_ERROR);
   store_callback.Run(false);
   RunUntilIdle();
   EXPECT_FALSE(store_->policy());
   EXPECT_TRUE(store_->policy_map().empty());
   EXPECT_EQ(CloudPolicyStore::STATUS_STORE_ERROR, store_->status());
 }
 
 TEST_F(UserCloudPolicyStoreChromeOSTest, StoreValidationError) {
   policy_.policy_data().clear_policy_type();
   policy_.Build();
 
   // Store policy.
   chromeos::SessionManagerClient::StorePolicyCallback store_callback;
   ExpectError(CloudPolicyStore::STATUS_VALIDATION_ERROR);
-  EXPECT_CALL(session_manager_client_, StoreUserPolicy(policy_.GetBlob(), _))
+  EXPECT_CALL(session_manager_client_,
+              StorePolicyForUser(PolicyBuilder::kFakeUsername,
+                                 policy_.GetBlob(), _, _))
       .Times(0);
   store_->Store(policy_.policy());
   RunUntilIdle();
   Mock::VerifyAndClearExpectations(&session_manager_client_);
 }
 
 TEST_F(UserCloudPolicyStoreChromeOSTest, StoreWithoutPolicyKey) {
   // Make the dbus call to cryptohome fail.
   Mock::VerifyAndClearExpectations(&cryptohome_client_);
   EXPECT_CALL(cryptohome_client_,
               GetSanitizedUsername(PolicyBuilder::kFakeUsername, _))
       .Times(AnyNumber())
       .WillRepeatedly(SendSanitizedUsername(chromeos::DBUS_METHOD_CALL_FAILURE,
                                             std::string()));
 
   // Store policy.
   chromeos::SessionManagerClient::StorePolicyCallback store_callback;
   ExpectError(CloudPolicyStore::STATUS_VALIDATION_ERROR);
-  EXPECT_CALL(session_manager_client_, StoreUserPolicy(policy_.GetBlob(), _))
+  EXPECT_CALL(session_manager_client_,
+              StorePolicyForUser(PolicyBuilder::kFakeUsername,
+                                 policy_.GetBlob(), _, _))
       .Times(0);
   store_->Store(policy_.policy());
   RunUntilIdle();
   Mock::VerifyAndClearExpectations(&session_manager_client_);
 }
 
 TEST_F(UserCloudPolicyStoreChromeOSTest, StoreWithInvalidSignature) {
   // Break the signature.
   policy_.policy().mutable_policy_data_signature()->append("garbage");
 
   // Store policy.
   chromeos::SessionManagerClient::StorePolicyCallback store_callback;
   ExpectError(CloudPolicyStore::STATUS_VALIDATION_ERROR);
-  EXPECT_CALL(session_manager_client_, StoreUserPolicy(policy_.GetBlob(), _))
+  EXPECT_CALL(session_manager_client_,
+              StorePolicyForUser(PolicyBuilder::kFakeUsername,
+                                 policy_.GetBlob(), _, _))
       .Times(0);
   store_->Store(policy_.policy());
   RunUntilIdle();
   Mock::VerifyAndClearExpectations(&session_manager_client_);
 }
 
 TEST_F(UserCloudPolicyStoreChromeOSTest, Load) {
   EXPECT_CALL(observer_, OnStoreLoaded(store_.get()));
   ASSERT_NO_FATAL_FAILURE(PerformPolicyLoad(policy_.GetBlob()));
   Mock::VerifyAndClearExpectations(&observer_);
@@ skipping 170 matching lines @@
       PerformStorePolicy(&new_public_key, kDefaultHomepage, kNewHomepage));
   VerifyPolicyMap(kNewHomepage);
 
   // Verify that the legacy cache has been removed.
   EXPECT_FALSE(file_util::PathExists(policy_file()));
 }
 
 }  // namespace
 
 }  // namespace policy