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

chrome/browser/chromeos/login/login_utils_browsertest.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/login/login_utils.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 120 matching lines @@
 // it is signaled to quit or perform some work.
 // |completion| is the event to wait for, and |work| is the task to invoke
 // when signaled. If the task returns false then this quits the IO loop.
 void BlockLoop(base::WaitableEvent* completion, base::Callback<bool()> work) {
   do {
     completion->Wait();
   } while (work.Run());
   MessageLoop::current()->QuitNow();
 }
 
-ACTION_P(MockSessionManagerClientRetrievePolicyCallback, policy) {
+ACTION_P(MockSessionManagerClientRetrieveDevicePolicyCallback, policy) {
   arg0.Run(*policy);
 }
 
+ACTION_P(MockSessionManagerClientRetrieveUserPolicyCallback, policy) {
+  arg1.Run(*policy);
+}
+
 ACTION_P(MockSessionManagerClientStorePolicyCallback, success) {
-  arg1.Run(success);
+  arg3.Run(success);
 }
 
 void CopyLockResult(base::RunLoop* loop,
                     policy::EnterpriseInstallAttributes::LockResult* out,
                     policy::EnterpriseInstallAttributes::LockResult result) {
   *out = result;
   loop->Quit();
 }
 
 class LoginUtilsTest : public testing::Test,
@@ skipping 70 matching lines @@
     LoginState::Initialize();
     ConnectivityStateHelper::SetForTest(&mock_connectivity_state_helper_);
 
     mock_input_method_manager_ = new input_method::MockInputMethodManager();
     input_method::InitializeForTesting(mock_input_method_manager_);
     disks::DiskMountManager::InitializeForTesting(&mock_disk_mount_manager_);
     mock_disk_mount_manager_.SetupDefaultReplies();
 
     // Likewise, SessionManagerClient should also be initialized before
     // io_thread_state_.
     MockSessionManagerClient* session_managed_client =

[Mattias Nissler (ping if slow), 2013/05/10 12:40:15]

while at it, can you fix the typo here?

[Joao da Silva, 2013/05/13 09:39:23]

This has been removed.

         mock_dbus_thread_manager_.mock_session_manager_client();
     EXPECT_CALL(*session_managed_client, RetrieveDevicePolicy(_))
+        .WillRepeatedly(MockSessionManagerClientRetrieveDevicePolicyCallback(
+            &device_policy_));
+    EXPECT_CALL(*session_managed_client, RetrievePolicyForUser(_, _))
         .WillRepeatedly(
-            MockSessionManagerClientRetrievePolicyCallback(&device_policy_));
-    EXPECT_CALL(*session_managed_client, RetrieveUserPolicy(_))
+            MockSessionManagerClientRetrieveUserPolicyCallback(&user_policy_));
+    EXPECT_CALL(*session_managed_client, StorePolicyForUser(_, _, _, _))
         .WillRepeatedly(
-            MockSessionManagerClientRetrievePolicyCallback(&user_policy_));
-    EXPECT_CALL(*session_managed_client, StoreUserPolicy(_, _))
-        .WillRepeatedly(
-            DoAll(SaveArg<0>(&user_policy_),
+            DoAll(SaveArg<1>(&user_policy_),
                   MockSessionManagerClientStorePolicyCallback(true)));
 
     mock_async_method_caller_ = new cryptohome::MockAsyncMethodCaller;
     cryptohome::AsyncMethodCaller::InitializeForTesting(
         mock_async_method_caller_);
 
     cryptohome_.reset(new MockCryptohomeLibrary());
     EXPECT_CALL(*cryptohome_, InstallAttributesIsInvalid())
         .WillRepeatedly(Return(false));
     EXPECT_CALL(*cryptohome_, InstallAttributesIsFirstInstall())
@@ skipping 489 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     LoginUtilsBlockingLoginTestInstance,
     LoginUtilsBlockingLoginTest,
     testing::Values(0, 1, 2, 3, 4, 5));
 
 }  // namespace
 
 }