Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/ui/auto_login_prompter.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/ui/auto_login_prompter.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 13 matching lines @@
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using content::WebContents;
 
 namespace {
 
 bool FetchUsernameThroughSigninManager(Profile* profile, std::string* output) {
   // In an incognito window these services are not available.
-  ProfileOAuth2TokenService* token_service =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
-  if (!token_service || !token_service->RefreshTokenIsAvailable())
-    return false;
-
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetInstance()->GetForProfile(profile);
   if (!signin_manager)
     return false;
 
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
+  if (!token_service || !token_service->RefreshTokenIsAvailable(
+          token_service->GetPrimaryAccountId())) {
+    return false;
+  }
+
   *output = signin_manager->GetAuthenticatedUsername();
   return true;
 }
 
 }  // namespace
 
 AutoLoginPrompter::AutoLoginPrompter(WebContents* web_contents,
                                      const Params& params,
                                      const GURL& url)
     : WebContentsObserver(web_contents),
@@ skipping 84 matching lines @@
     return;
 
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   // |infobar_service| is NULL for WebContents hosted in WebDialog.
   if (infobar_service) {
     AutoLoginInfoBarDelegate::Create(infobar_service, params_);
     infobar_shown_ = true;
   }
 }