Added UserPolicySigninService::FetchPolicyForSignedInUser().

chrome/browser/policy/user_policy_signin_service.h

Index: chrome/browser/policy/user_policy_signin_service.h
diff --git a/chrome/browser/policy/user_policy_signin_service.h b/chrome/browser/policy/user_policy_signin_service.h
index 8fab6fa3f524a95aa8130eea06201c99b2c2f432..553a49c7116dac200df36e9c6d6fcca9855da680 100644
--- a/chrome/browser/policy/user_policy_signin_service.h
+++ b/chrome/browser/policy/user_policy_signin_service.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/policy/cloud_policy_service.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
@@ -24,20 +25,41 @@ namespace policy {
 
 class UserCloudPolicyManager;
 
-// The UserPolicySigninService tracks when user signin/signout actions occur and
-// initializes/shuts down the UserCloudPolicyManager as required. This class is
-// not used on ChromeOS because UserCloudPolicyManager initialization is handled
-// via LoginUtils, since it must happen before profile creation.
+// The UserPolicySigninService is responsible for interacting with the policy
+// infrastructure (mainly UserCloudPolicyManager) to load policy for the signed
+// in user.
+//
+// At signin time, this class initializes the UCPM and loads policy before any
+// other signed in services are initialized. After each restart, this class
+// ensures that the CloudPolicyClient is registered (in case the policy server
+// was offline during the initial policy fetch) and if not it initiates a fresh
+// registration process.
+//
+// Finally, if the user signs out, this class is responsible for shutting down
+// the policy infrastructure to ensure that any cached policy is cleared.
 class UserPolicySigninService
     : public ProfileKeyedService,
       public OAuth2AccessTokenConsumer,
       public CloudPolicyService::Observer,
+      public CloudPolicyClient::Observer,
       public content::NotificationObserver {
  public:
   // Creates a UserPolicySigninService associated with the passed |profile|.
   explicit UserPolicySigninService(Profile* profile);
   virtual ~UserPolicySigninService();
 
+  // The callback invoked once policy fetch is complete. Passed boolean
+  // parameter is set to true if the policy fetch succeeded.
+  typedef base::Callback<void(bool)> PolicyFetchCallback;
+
+  // Initiates a policy fetch as part of user signin. The |oauth2_access_token|
+  // is explicitly passed because TokenService does not have the token yet
+  // (to prevent services from using it until after we've fetched policy).
+  // |callback| is invoked once the policy fetch is complete, passing true if
+  // the policy fetch succeeded.
+  void FetchPolicyForSignedInUser(const std::string& oauth2_access_token,
+                                  const PolicyFetchCallback& callback);
+
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
@@ -46,6 +68,12 @@ class UserPolicySigninService
   // CloudPolicyService::Observer implementation.
   virtual void OnInitializationCompleted(CloudPolicyService* service) OVERRIDE;
 
+  // CloudPolicyClient::Observer implementation.
+  virtual void OnClientError(CloudPolicyClient* client) OVERRIDE;
+  virtual void OnPolicyFetched(CloudPolicyClient* client) OVERRIDE;
+  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) OVERRIDE;
+

[Mattias Nissler (ping if slow), 2012/12/07 15:20:45]

remove extra blank line.

[Andrew T Wilson (Slow), 2012/12/07 17:34:29]

Done.

+
   // OAuth2AccessTokenConsumer implementation.
   virtual void OnGetTokenSuccess(const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
@@ -57,22 +85,46 @@ class UserPolicySigninService
  private:
   // Initializes the UserCloudPolicyManager to reflect the currently-signed-in
   // user.
-  void ConfigureUserCloudPolicyManager();
+  void InitializeUserCloudPolicyManager();
 
   // Fetches an OAuth token to allow the cloud policy service to register with
-  // the cloud policy server.
-  void RegisterCloudPolicyService();
-
-  // Helper routine to unregister for CloudPolicyService notifications.
+  // the cloud policy server. |oauth_login_token| should contain an OAuth login
+  // refresh token that can be downscoped to get an access token for the
+  // device_management service.
+  void RegisterCloudPolicyService(std::string oauth_login_token);
+
+  // Helper routines to (un)register for CloudPolicyService and
+  // CloudPolicyClient notifications.
+  void StartObserving();
   void StopObserving();
 
+  // If a policy fetch was requested, invokes the callback passing through the
+  // |success| flag.
+  void NotifyPendingFetchCallback(bool success);
+
+  // Shuts down the UserCloudPolicyManager (for example, after the user signs
+  // out) and deletes any cached policy.
+  void ShutdownUserCloudPolicyManager();
+
   // Convenience helper to get the UserCloudPolicyManager for |profile_|.
   UserCloudPolicyManager* GetManager();
 
+  // WeakPtrFactory used to create callbacks for loading policy.
+  base::WeakPtrFactory<UserPolicySigninService> weak_factory_;
+
   // Weak pointer to the profile this service is associated with.
   Profile* profile_;
 
+  // If true, we have a pending fetch so notify the callback the next time
+  // the appropriate notification is delivered from CloudPolicyService/Client.
+  bool pending_fetch_;
+
+  // The callback to invoke when the pending policy fetch is completed.
+  PolicyFetchCallback pending_fetch_callback_;
+
   content::NotificationRegistrar registrar_;
+
+  // Fetcher used while obtaining an OAuth token for client registration.
   scoped_ptr<OAuth2AccessTokenFetcher> oauth2_access_token_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(UserPolicySigninService);