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

chrome/browser/extensions/extension_install_prompt.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/extensions/extension_install_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 696 matching lines @@
   const extensions::OAuth2Info& oauth2_info =
       extensions::OAuth2Info::GetOAuth2Info(extension_);
   if (oauth2_info.client_id.empty() ||
       oauth2_info.scopes.empty()) {
     ShowConfirmation();
     return;
   }
 
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(install_ui_->profile());
-  if (!token_service || !token_service->RefreshTokenIsAvailable()) {
+  if (!token_service || !token_service->RefreshTokenIsAvailable(
+          token_service->GetPrimaryAccountId())) {
     ShowConfirmation();
     return;
   }
 
   // Get an access token from the token service.
   login_token_request_ = token_service->StartRequest(
-      OAuth2TokenService::ScopeSet(), this);
+      token_service->GetPrimaryAccountId(),
+      OAuth2TokenService::ScopeSet(),
+      this);
 }
 
 void ExtensionInstallPrompt::OnGetTokenSuccess(
     const OAuth2TokenService::Request* request,
     const std::string& access_token,
     const base::Time& expiration_time) {
   DCHECK_EQ(login_token_request_.get(), request);
   login_token_request_.reset();
 
   const extensions::OAuth2Info& oauth2_info =
@@ skipping 65 matching lines @@
   }
 
   if (AutoConfirmPrompt(delegate_))
     return;
 
   if (show_dialog_callback_.is_null())
     GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_);
   else
     show_dialog_callback_.Run(show_params_, delegate_, prompt_);
 }