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

The SessionManagerClient is used to store and retrieve the user policy blobs
to and from the session_manager over DBus. New variants of these calls have been
introduced that have an additional 'username' argument, so that user policy can
be used with multiple profiles.

This CL updates the SessionManagerClient to use the new calls, and it also
makes the SessionManagerClientStub mimic the behavior of session_manager
regarding the user policy key, so that user policy can be validated and loaded
on desktop builds.

BUG=187482,230349
TEST=User policy works as before, all tests green; user policy works with --multi-profiles, and on desktop builds with --login-manager

Review URL: https://chromiumcodereview.appspot.com/14761012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199861 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 2 deletions

diff --git a/chromeos/dbus/mock_session_manager_client.h b/chromeos/dbus/mock_session_manager_client.h
index 53b5d6d..f5b915f 100644
--- a/chromeos/dbus/mock_session_manager_client.h
+++ b/chromeos/dbus/mock_session_manager_client.h
@@ -32,15 +32,19 @@ class MockSessionManagerClient : public SessionManagerClient {
   MOCK_METHOD0(RequestUnlockScreen, void(void));
   MOCK_METHOD0(NotifyLockScreenDismissed, void(void));
   MOCK_METHOD1(RetrieveDevicePolicy, void(const RetrievePolicyCallback&));
-  MOCK_METHOD1(RetrieveUserPolicy, void(const RetrievePolicyCallback&));
+  MOCK_METHOD2(RetrievePolicyForUser,
+               void(const std::string&,
+                    const RetrievePolicyCallback&));
   MOCK_METHOD2(RetrieveDeviceLocalAccountPolicy,
                void(const std::string&,
                     const RetrievePolicyCallback&));
   MOCK_METHOD2(StoreDevicePolicy,
                void(const std::string&,
                     const StorePolicyCallback&));
-  MOCK_METHOD2(StoreUserPolicy,
+  MOCK_METHOD4(StorePolicyForUser,
                void(const std::string&,
+                    const std::string&,
+                    const std::string&,
                     const StorePolicyCallback&));
   MOCK_METHOD3(StoreDeviceLocalAccountPolicy,
                void(const std::string&,