GAIA ID migration for Android

chrome/browser/policy/cloud/user_policy_signin_service_mobile.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_CLOUD_USER_POLICY_SIGNIN_SERVICE_MOBILE_H_
 #define CHROME_BROWSER_POLICY_CLOUD_USER_POLICY_SIGNIN_SERVICE_MOBILE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 27 matching lines @@
       UserCloudPolicyManager* policy_manager,
       SigninManager* signin_manager,
       scoped_refptr<net::URLRequestContextGetter> system_request_context,
       ProfileOAuth2TokenService* token_service);
   ~UserPolicySigninService() override;
 
   // Registers a CloudPolicyClient for fetching policy for |username|.
   // This requests an OAuth2 token for the services involved, and contacts
   // the policy service if the account has management enabled.
   // |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)
   // Registers a CloudPolicyClient for fetching policy for |username|.
   // This requires a valid OAuth access token for the scopes returned by the
   // |GetScopes| static function. |callback| is invoked once we have
   // registered this device to fetch policy, or once it is determined that
   // |username| is not a managed account.
   void RegisterForPolicyWithAccessToken(
       const std::string& username,
       const std::string& access_token,
       const PolicyRegistrationCallback& callback);
 
   // Returns the list of OAuth access scopes required for policy fetching.
   static std::vector<std::string> GetScopes();
 #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);
 
   // KeyedService implementation:
   void Shutdown() override;
 
   // CloudPolicyService::Observer implementation:
   void OnInitializationCompleted(CloudPolicyService* service) override;
 
@@ skipping 19 matching lines @@
   PrefService* profile_prefs_;
 
   base::WeakPtrFactory<UserPolicySigninService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserPolicySigninService);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_USER_POLICY_SIGNIN_SERVICE_MOBILE_H_