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

chromeos/dbus/session_manager_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_SESSION_MANAGER_CLIENT_H_
 #define CHROMEOS_DBUS_SESSION_MANAGER_CLIENT_H_
 
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
@@ skipping 71 matching lines @@
 
   // Notifies that the lock screen is shown.
   virtual void NotifyLockScreenShown() = 0;
 
   // Unlocks the screen.
   virtual void RequestUnlockScreen() = 0;
 
   // Notifies that the lock screen is dismissed.
   virtual void NotifyLockScreenDismissed() = 0;
 
-  // Used for RetrieveDevicePolicy, RetrieveUserPolicy and
+  // Used for RetrieveDevicePolicy, RetrievePolicyForUser and
   // RetrieveDeviceLocalAccountPolicy. Takes a serialized protocol buffer as
   // string.  Upon success, we will pass a protobuf to the callback.  On
   // failure, we will pass "".
   typedef base::Callback<void(const std::string&)> RetrievePolicyCallback;
 
   // Fetches the device policy blob stored by the session manager.  Upon
   // completion of the retrieve attempt, we will call the provided callback.
   virtual void RetrieveDevicePolicy(const RetrievePolicyCallback& callback) = 0;
 
-  // Fetches the user policy blob stored by the session manager for the
-  // currently signed-in user.  Upon completion of the retrieve attempt, we will
-  // call the provided callback.
-  virtual void RetrieveUserPolicy(const RetrievePolicyCallback& callback) = 0;
+  // Fetches the user policy blob stored by the session manager for the given
+  // |username|. Upon completion of the retrieve attempt, we will call the
+  // provided callback.
+  virtual void RetrievePolicyForUser(
+      const std::string& username,
+      const RetrievePolicyCallback& callback) = 0;
 
   // Fetches the policy blob associated with the specified device-local account
   // from session manager.  |callback| is invoked up on completion.
   virtual void RetrieveDeviceLocalAccountPolicy(
       const std::string& account_id,
       const RetrievePolicyCallback& callback) = 0;
 
-  // Used for StoreDevicePolicy, StoreUserPolicy and
+  // Used for StoreDevicePolicy, StorePolicyForUser and
   // StoreDeviceLocalAccountPolicy. Takes a boolean indicating whether the
   // operation was successful or not.
   typedef base::Callback<void(bool)> StorePolicyCallback;
 
   // Attempts to asynchronously store |policy_blob| as device policy.  Upon
   // completion of the store attempt, we will call callback.
   virtual void StoreDevicePolicy(const std::string& policy_blob,
                                  const StorePolicyCallback& callback) = 0;
 
-  // Attempts to asynchronously store |policy_blob| as user policy for the
-  // currently signed-in user.  Upon completion of the store attempt, we will
-  // call callback.
-  virtual void StoreUserPolicy(const std::string& policy_blob,
-                               const StorePolicyCallback& callback) = 0;
+  // Attempts to asynchronously store |policy_blob| as user policy for the given
+  // |username|. Upon completion of the store attempt, we will call callback.
+  // The |policy_key| argument is not sent to the session manager, but is used
+  // by the stub implementation to enable policy validation on desktop builds.
+  virtual void StorePolicyForUser(const std::string& username,
+                                  const std::string& policy_blob,
+                                  const std::string& policy_key,
+                                  const StorePolicyCallback& callback) = 0;
 
   // Sends a request to store a policy blob for the specified device-local
   // account. The result of the operation is reported through |callback|.
   virtual void StoreDeviceLocalAccountPolicy(
       const std::string& account_id,
       const std::string& policy_blob,
       const StorePolicyCallback& callback) = 0;
 
   // Creates the instance.
   static SessionManagerClient* Create(DBusClientImplementationType type,
                                       dbus::Bus* bus);
 
   virtual ~SessionManagerClient();
 
  protected:
   // Create() should be used instead.
   SessionManagerClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionManagerClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SESSION_MANAGER_CLIENT_H_