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

chrome/browser/signin/ubertoken_fetcher.cc

Index: chrome/browser/signin/ubertoken_fetcher.cc
diff --git a/chrome/browser/signin/ubertoken_fetcher.cc b/chrome/browser/signin/ubertoken_fetcher.cc
index b726b700104865374b766759ffeb57956a673282..f8ffd14006d9b8bda288833569c04be71747a9f0 100644
--- a/chrome/browser/signin/ubertoken_fetcher.cc
+++ b/chrome/browser/signin/ubertoken_fetcher.cc
@@ -28,9 +28,10 @@ UbertokenFetcher::~UbertokenFetcher() {
 void UbertokenFetcher::StartFetchingToken() {
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaUrls::GetInstance()->oauth1_login_scope());
-  access_token_request_ =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
-          StartRequest(scopes, this);
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
+  access_token_request_ = token_service->StartRequest(
+      token_service->GetPrimaryAccountId(), scopes, this);
 }
 
 void UbertokenFetcher::OnUberAuthTokenSuccess(const std::string& token) {