Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/policy/cloud/cloud_policy_client_registration_helper.h

 // Copyright 2013 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 CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_CLIENT_REGISTRATION_HELPER_H_
 #define CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_CLIENT_REGISTRATION_HELPER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/policy/cloud/cloud_policy_client.h"
 #include "chrome/browser/policy/cloud/user_info_fetcher.h"
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 
-class AndroidProfileOAuth2TokenService;
+class OAuth2TokenService;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace policy {
 
 // Helper class that registers a CloudPolicyClient. It fetches an OAuth2 token
 // for the DM service if needed, and checks with Gaia if the account has policy
 // management enabled.
 class CloudPolicyClientRegistrationHelper : public UserInfoFetcher::Delegate,
                                             public CloudPolicyClient::Observer {
  public:
   // |context| and |client| are not owned and must outlive this object.
   // If |should_force_load_policy| then the cloud policy registration is
   // performed even if Gaia indicates that this account doesn't have management
   // enabled.
   CloudPolicyClientRegistrationHelper(
       net::URLRequestContextGetter* context,
       CloudPolicyClient* client,
       bool should_force_load_policy,
       enterprise_management::DeviceRegisterRequest::Type registration_type);
   virtual ~CloudPolicyClientRegistrationHelper();
 
-#if defined(OS_ANDROID)
   // Starts the client registration process. This version uses the
-  // AndroidProfileOAuth2TokenService to mint the new token for the userinfo
+  // supplied OAuth2TokenService to mint the new token for the userinfo
   // and DM services, using the |username| account.
   // |callback| is invoked when the registration is complete.
-  void StartRegistration(AndroidProfileOAuth2TokenService* token_service,
-                         const std::string& username,
-                         const base::Closure& callback);
+  void StartRegistration(
+#if defined(OS_ANDROID)
+      // TODO(atwilson): Remove this when the Android StartRequestForUsername()
+      // API is folded into the base OAuth2TokenService class (when that class
+      // is made multi-account aware).
+      AndroidProfileOAuth2TokenService* token_service,
 #else
+      OAuth2TokenService* token_service,
+#endif
+      const std::string& username,
+      const base::Closure& callback);
+
+#if !defined(OS_ANDROID)
   // Starts the client registration process. The |login_refresh_token| is used
   // to mint a new token for the userinfo and DM services.
   // |callback| is invoked when the registration is complete.
   void StartRegistrationWithLoginToken(const std::string& login_refresh_token,
                                        const base::Closure& callback);
 #endif
 
+  class TokenHelper;
+
  private:
-#if defined(OS_ANDROID)
-  class TokenHelperAndroid;
-#else
-  class TokenHelper;
-#endif
-
   void OnTokenFetched(const std::string& oauth_access_token);
 
   // UserInfoFetcher::Delegate implementation:
   virtual void OnGetUserInfoSuccess(
       const base::DictionaryValue* response) OVERRIDE;
   virtual void OnGetUserInfoFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
 
   // CloudPolicyClient::Observer implementation:
   virtual void OnPolicyFetched(CloudPolicyClient* client) OVERRIDE;
   virtual void OnRegistrationStateChanged(CloudPolicyClient* client) OVERRIDE;
   virtual void OnClientError(CloudPolicyClient* client) OVERRIDE;
 
   // Invoked when the registration request has been completed.
   void RequestCompleted();
 
-  // Internal helper used to fetch the access token. There is an OS_ANDROID
-  // implementation which uses the AccountManager and a known account name,
-  // and a desktop implementation which uses an OAuth2AccessTokenFetcher.
-#if defined(OS_ANDROID)
-  scoped_ptr<TokenHelperAndroid> token_helper_;
-#else
+  // Internal helper used to fetch the access token. There are two
+  // implementations on desktop - one that uses a supplied login token for use
+  // when there is no signed-in user, and one that uses OAuth2TokenService
+  // (Android always uses OAuth2TokenService).
   scoped_ptr<TokenHelper> token_helper_;
-#endif
 
   // Helper class for fetching information from GAIA about the currently
   // signed-in user.
   scoped_ptr<UserInfoFetcher> user_info_fetcher_;
 
   // Access token used to register the CloudPolicyClient and also access
   // GAIA to get information about the signed in user.
   std::string oauth_access_token_;
 
   net::URLRequestContextGetter* context_;
   CloudPolicyClient* client_;
   bool should_force_load_policy_;
   enterprise_management::DeviceRegisterRequest::Type registration_type_;
   base::Closure callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyClientRegistrationHelper);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_CLIENT_REGISTRATION_HELPER_H_