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

chrome/browser/policy/cloud/cloud_policy_client_registration_helper.h

Index: chrome/browser/policy/cloud/cloud_policy_client_registration_helper.h
diff --git a/chrome/browser/policy/cloud/cloud_policy_client_registration_helper.h b/chrome/browser/policy/cloud/cloud_policy_client_registration_helper.h
index cb26ed5d632b0ff14042e88b89e1609ab22593c3..47f02012443e63de06115efa58243c1a8c6a4027 100644
--- a/chrome/browser/policy/cloud/cloud_policy_client_registration_helper.h
+++ b/chrome/browser/policy/cloud/cloud_policy_client_registration_helper.h
@@ -15,7 +15,6 @@
 #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 {
@@ -43,18 +42,11 @@ class CloudPolicyClientRegistrationHelper : public UserInfoFetcher::Delegate,
 
   // 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)