GAIA ID migration for Android

chrome/browser/signin/profile_oauth2_token_service_factory.cc

 // Copyright (c) 2012 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/signin/profile_oauth2_token_service_factory.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
@@ skipping 29 matching lines @@
 }
 
 // static
 ProfileOAuth2TokenServiceFactory*
     ProfileOAuth2TokenServiceFactory::GetInstance() {
   return Singleton<ProfileOAuth2TokenServiceFactory>::get();
 }
 
 KeyedService* ProfileOAuth2TokenServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
+  Profile* profile = static_cast<Profile*>(context);
 #if defined(OS_ANDROID)
   OAuth2TokenServiceDelegateAndroid* delegate =
       new OAuth2TokenServiceDelegateAndroid();
-  delegate->Initialize();
+  delegate->Initialize(
+      AccountTrackerServiceFactory::GetInstance()->GetForProfile(profile));

[Roger Tawa OOO till Jul 10th, 2015/08/14 15:01:22]

Please pass the ATS in the ctor of OAuth2TokenServiceDelegateAndroid to match
how MutableProfileOAuth2TokenServiceDelegate passes in dependent services.

[gogerald1, 2015/08/18 01:14:27]

Done.

 #else
-  Profile* profile = static_cast<Profile*>(context);
   MutableProfileOAuth2TokenServiceDelegate* delegate =
       new MutableProfileOAuth2TokenServiceDelegate(
           ChromeSigninClientFactory::GetInstance()->GetForProfile(profile),
           SigninErrorControllerFactory::GetInstance()->GetForProfile(profile),
           AccountTrackerServiceFactory::GetInstance()->GetForProfile(profile));
 #endif
   ProfileOAuth2TokenService* service = new ProfileOAuth2TokenService(delegate);
   return service;
 }