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

chrome/browser/history/web_history_service.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/history/web_history_service.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
@@ skipping 63 matching lines @@
         is_pending_(false) {
   }
 
   // Tells the request to do its thang.
   void Start() {
     OAuth2TokenService::ScopeSet oauth_scopes;
     oauth_scopes.insert(kHistoryOAuthScope);
 
     ProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
-    token_request_ = token_service->StartRequest(oauth_scopes, this);
+    token_request_ = token_service->StartRequest(
+        token_service->GetPrimaryAccountId(), oauth_scopes, this);
     is_pending_ = true;
   }
 
   // content::URLFetcherDelegate interface.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE {
     DCHECK_EQ(source, url_fetcher_.get());
     response_code_ = url_fetcher_->GetResponseCode();
 
     UMA_HISTOGRAM_CUSTOM_ENUMERATION("WebHistory.OAuthTokenResponseCode",
         net::HttpUtil::MapStatusCodeForHistogram(response_code_),
         net::HttpUtil::GetStatusCodesForHistogram());
 
     // If the response code indicates that the token might not be valid,
     // invalidate the token and try again.
     if (response_code_ == net::HTTP_UNAUTHORIZED && ++auth_retry_count_ <= 1) {
       OAuth2TokenService::ScopeSet oauth_scopes;
       oauth_scopes.insert(kHistoryOAuthScope);
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)
-          ->InvalidateToken(oauth_scopes, access_token_);
+      ProfileOAuth2TokenService* token_service =
+          ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
+      token_service->InvalidateToken(token_service->GetPrimaryAccountId(),
+                                     oauth_scopes,
+                                     access_token_);
 
-      access_token_ = std::string();
+      access_token_.clear();
       Start();
       return;
     }
     url_fetcher_->GetResponseAsString(&response_body_);
     url_fetcher_.reset();
     is_pending_ = false;
     callback_.Run(this, true);
     // It is valid for the callback to delete |this|, so do not access any
     // members below here.
   }
@@ skipping 273 matching lines @@
   scoped_ptr<DictionaryValue> response_value;
   if (success) {
     response_value = ReadResponse(static_cast<RequestImpl*>(request));
     if (response_value)
       response_value->GetString("version_info", &server_version_info_);
   }
   callback.Run(request, response_value.get() && success);
 }
 
 }  // namespace history