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

chrome/browser/chromeos/app_mode/startup_app_launcher.cc

 // Copyright 2013 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/chromeos/app_mode/startup_app_launcher.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 133 matching lines @@
 
   net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   OnNetworkChanged(net::NetworkChangeNotifier::GetConnectionType());
 }
 
 void StartupAppLauncher::InitializeTokenService() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnInitializingTokenService());
 
   ProfileOAuth2TokenService* profile_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
-  if (profile_token_service->RefreshTokenIsAvailable()) {
+  if (profile_token_service->RefreshTokenIsAvailable(
+          profile_token_service->GetPrimaryAccountId())) {
     InitializeNetwork();
     return;
   }
 
   // At the end of this method, the execution will be put on hold until
   // ProfileOAuth2TokenService triggers either OnRefreshTokenAvailable or
   // OnRefreshTokensLoaded. Given that we want to handle exactly one event,
   // whichever comes first, both handlers call RemoveObserver on PO2TS. Handling
   // any of the two events is the only way to resume the execution and enable
   // Cleanup method to be called, self-invoking a destructor. In destructor
@@ skipping 125 matching lines @@
     net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
     network_wait_timer_.Stop();
 
     BeginInstall();
   } else {
     DVLOG(1) << "Network not running yet!";
   }
 }
 
 }   // namespace chromeos