OAuth2 sign-in flow for ChromeOS

chrome/browser/signin/signin_manager.cc

Index: chrome/browser/signin/signin_manager.cc
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index 24fbd35446fa83ad1d51b5c0953c87202dee94f6..626862faa271444c10bee22efcdf9708e3f04199 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -130,9 +130,15 @@ void SigninManager::Initialize(Profile* profile) {
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
   if (token_service) {
     token_service->Initialize(GaiaConstants::kChromeSource, profile_);
+    // ChromeOS will kick off TokenService::LoadTokensFromDB from
+    // OAuthLoginManager once the rest of the Profile is fully initialized.
+    // Starting it from here would cause OAuthLoginManager mismatch the origin
+    // of OAuth2 tokens.
+#if !defined(OS_CHROMEOS)
     if (!authenticated_username_.empty()) {
       token_service->LoadTokensFromDB();
     }
+#endif
   }
   if (!user.empty() && !IsAllowedUsername(user)) {
     // User is signed in, but the username is invalid - the administrator must