GAIA ID migration for Android

chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/policy/cloud/user_policy_signin_service_mobile.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 51 matching lines @@
   // iOS doesn't create this service with the Profile; instead it's created
   // a little bit later. See UserPolicySigninServiceFactory.
   InitializeOnProfileReady(profile);
 #endif
 }
 
 UserPolicySigninService::~UserPolicySigninService() {}
 
 void UserPolicySigninService::RegisterForPolicy(
     const std::string& username,
+    const std::string& accountId,
     const PolicyRegistrationCallback& callback) {
-  RegisterForPolicyInternal(username, "", callback);
+  RegisterForPolicyInternal(username, accountId, "", callback);
 }
 
 #if !defined(OS_ANDROID)
 void UserPolicySigninService::RegisterForPolicyWithAccessToken(
     const std::string& username,
     const std::string& access_token,
     const PolicyRegistrationCallback& callback) {
-  RegisterForPolicyInternal(username, access_token, callback);
+  RegisterForPolicyInternal(username, "", access_token, callback);

[Roger Tawa OOO till Jul 10th, 2015/08/12 15:28:47]

This won't work on non-android platforms.  Since this file ends with _mobile.cc,
I assume this only means iOS.  I think we need account_id arg here too.

[gogerald1, 2015/08/13 18:12:12]

This interface go with access_token, so we no need account id anymore.

 }
 
 // static
 std::vector<std::string> UserPolicySigninService::GetScopes() {
   return CloudPolicyClientRegistrationHelper::GetScopes();
 }
 #endif
 
 void UserPolicySigninService::RegisterForPolicyInternal(
     const std::string& username,
+    const std::string& accountId,
     const std::string& access_token,
     const PolicyRegistrationCallback& callback) {
   // Create a new CloudPolicyClient for fetching the DMToken.
   scoped_ptr<CloudPolicyClient> policy_client = CreateClientForRegistrationOnly(
       username);
   if (!policy_client) {
     callback.Run(std::string(), std::string());
     return;
   }
 
   CancelPendingRegistration();
 
   // Fire off the registration process. Callback keeps the CloudPolicyClient
   // alive for the length of the registration process.
   registration_helper_.reset(new CloudPolicyClientRegistrationHelper(
       policy_client.get(),
       kCloudPolicyRegistrationType));
 
   if (access_token.empty()) {
     registration_helper_->StartRegistration(
-        oauth2_token_service_,
-        username,
+        oauth2_token_service_, accountId,
         base::Bind(&UserPolicySigninService::CallPolicyRegistrationCallback,
-                   base::Unretained(this),
-                   base::Passed(&policy_client),
+                   base::Unretained(this), base::Passed(&policy_client),
                    callback));
   } else {
 #if defined(OS_ANDROID)
     NOTREACHED();
 #else
     registration_helper_->StartRegistrationWithAccessToken(
         access_token,
         base::Bind(&UserPolicySigninService::CallPolicyRegistrationCallback,
                    base::Unretained(this),
                    base::Passed(&policy_client),
@@ skipping 69 matching lines @@
   DCHECK(policy_manager()->core()->client());
 
   // Persist the current time as the last policy registration attempt time.
   profile_prefs_->SetInt64(prefs::kLastPolicyCheckTime,
                            base::Time::Now().ToInternalValue());
 
   registration_helper_.reset(new CloudPolicyClientRegistrationHelper(
       policy_manager()->core()->client(),
       kCloudPolicyRegistrationType));
   registration_helper_->StartRegistration(
-      oauth2_token_service_,
-      signin_manager()->GetAuthenticatedUsername(),
+      oauth2_token_service_, signin_manager()->GetAuthenticatedAccountId(),

[Roger Tawa OOO till Jul 10th, 2015/08/12 15:28:47]

Good catch.

[gogerald1, 2015/08/13 18:12:12]

Done.

       base::Bind(&UserPolicySigninService::OnRegistrationDone,
                  base::Unretained(this)));
 }
 
 void UserPolicySigninService::CancelPendingRegistration() {
   weak_factory_.InvalidateWeakPtrs();
 }
 
 void UserPolicySigninService::OnRegistrationDone() {
   registration_helper_.reset();
 }
 
 }  // namespace policy