Making OAuth2TokenService multi-login aware, updating callers, minor fixes

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();
 
   // Starts the client registration process. This version uses the
   // supplied OAuth2TokenService to mint the new token for the userinfo
-  // and DM services, using the |username| account.
+  // and DM services, using the |account_id|.
   // |callback| is invoked when the registration is complete.
   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 std::string& account_id,
       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
 
@@ skipping 45 matching lines @@
   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_