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

chrome/browser/chromeos/login/login_utils_browsertest.cc

Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index 99d663b8747c5711f63bfd8e535dfa7b66175b9b..02447d7251a5446c1f5a139cacdeb1b5a0e7a708 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -138,12 +138,16 @@ void BlockLoop(base::WaitableEvent* completion, base::Callback<bool()> work) {
   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,
@@ -237,14 +241,14 @@ class LoginUtilsTest : public testing::Test,
     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(_))
-        .WillRepeatedly(
-            MockSessionManagerClientRetrievePolicyCallback(&user_policy_));
-    EXPECT_CALL(*session_managed_client, StoreUserPolicy(_, _))
+            MockSessionManagerClientRetrieveUserPolicyCallback(&user_policy_));
+    EXPECT_CALL(*session_managed_client, StorePolicyForUser(_, _, _, _))
         .WillRepeatedly(
-            DoAll(SaveArg<0>(&user_policy_),
+            DoAll(SaveArg<1>(&user_policy_),
                   MockSessionManagerClientStorePolicyCallback(true)));
 
     mock_async_method_caller_ = new cryptohome::MockAsyncMethodCaller;