GAIA ID migration for Android

chrome/browser/policy/cloud/user_policy_signin_service_mobile.h

Index: chrome/browser/policy/cloud/user_policy_signin_service_mobile.h
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h
index 96592864853c4432e955fc51a4848a42206f63fa..b0536743c948413c5185821fc7940d2215ce607a 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h
@@ -47,6 +47,7 @@ class UserPolicySigninService : public UserPolicySigninServiceBase {
   // |callback| is invoked once we have registered this device to fetch policy,
   // or once it is determined that |username| is not a managed account.

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

Please add documentation for |account_id| arg.

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

Done.

   void RegisterForPolicy(const std::string& username,
+                         const std::string& accountId,
                          const PolicyRegistrationCallback& callback);
 
 #if !defined(OS_ANDROID)
@@ -65,10 +66,10 @@ class UserPolicySigninService : public UserPolicySigninServiceBase {
 #endif
 
  private:
-  void RegisterForPolicyInternal(
-      const std::string& username,
-      const std::string& access_token,
-      const PolicyRegistrationCallback& callback);
+  void RegisterForPolicyInternal(const std::string& username,
+                                 const std::string& accountId,

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

Use account_id.  Also in cc file.  Also above function.

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

Done.

+                                 const std::string& access_token,
+                                 const PolicyRegistrationCallback& callback);
 
   void CallPolicyRegistrationCallback(scoped_ptr<CloudPolicyClient> client,
                                       PolicyRegistrationCallback callback);