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

chrome/browser/chromeos/login/oauth2_login_verifier.cc

 // Copyright (c) 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/login/oauth2_login_verifier.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 58 matching lines @@
   }
 
   access_token_.clear();
   gaia_token_.clear();
   StartFetchingOAuthLoginAccessToken(profile);
 }
 
 void OAuth2LoginVerifier::StartFetchingOAuthLoginAccessToken(Profile* profile) {
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaUrls::GetInstance()->oauth1_login_scope());
-  login_token_request_ = ProfileOAuth2TokenServiceFactory::
-      GetForProfile(profile)->StartRequestWithContext(
-          system_request_context_.get(), scopes, this);
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
+  login_token_request_ = token_service->StartRequestWithContext(
+      token_service->GetPrimaryAccountId(),
+      system_request_context_.get(),
+      scopes,
+      this);
 }
 
 void OAuth2LoginVerifier::StartOAuthLoginForUberToken() {
   // No service will fetch us uber auth token.
   gaia_system_fetcher_.reset(
       new GaiaAuthFetcher(this,
                           std::string(GaiaConstants::kChromeOSSource),
                           system_request_context_.get()));
   gaia_system_fetcher_->StartTokenFetchForUberAuthExchange(access_token_);
 }
@@ skipping 131 matching lines @@
   LOG(WARNING) << "Unrecoverable error or retry count max reached for "
              << operation_id;
   UMA_HISTOGRAM_ENUMERATION(
       base::StringPrintf("OAuth2Login.%sFailure", operation_id),
       error.state(),
       GoogleServiceAuthError::NUM_STATES);
   error_handler.Run();
 }
 
 }  // namespace chromeos