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

chrome/browser/signin/fake_profile_oauth2_token_service.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/signin/fake_profile_oauth2_token_service.h"
 
+#include "chrome/browser/profiles/profile.h"
+
 FakeProfileOAuth2TokenService::PendingRequest::PendingRequest() {
 }
 
 FakeProfileOAuth2TokenService::PendingRequest::~PendingRequest() {
 }
 
 // static
 BrowserContextKeyedService* FakeProfileOAuth2TokenService::Build(
-    content::BrowserContext* profile) {
-  return new FakeProfileOAuth2TokenService();
+    content::BrowserContext* context) {
+  // Initialize called explicitly here, instead of by passing a Profile to the
+  // constructor, as not all of the consuming tests need an initialized service.
+  ProfileOAuth2TokenService* token_service =
+      new FakeProfileOAuth2TokenService();
+  token_service->Initialize(static_cast<Profile*>(context));
+  return token_service;
 }
 
-FakeProfileOAuth2TokenService::FakeProfileOAuth2TokenService() {
+FakeProfileOAuth2TokenService::FakeProfileOAuth2TokenService()
+    : is_initialized_(false) {
 }
 
 FakeProfileOAuth2TokenService::~FakeProfileOAuth2TokenService() {
 }
 
+void FakeProfileOAuth2TokenService::Initialize(Profile* profile) {
+  ProfileOAuth2TokenService::Initialize(profile);
+  is_initialized_ = true;
+}
+
 void FakeProfileOAuth2TokenService::Shutdown() {
-  // Do not call the base class handler because it assumes that Initialize()
-  // is always called before Shutdown() and that's not the case for this mock.
+  if (is_initialized_) {
+    ProfileOAuth2TokenService::Shutdown();
+    is_initialized_ = false;
+  }
 }
 
 void FakeProfileOAuth2TokenService::IssueRefreshToken(
     const std::string& token) {
   refresh_token_ = token;
   if (refresh_token_.empty())
     FireRefreshTokenRevoked("account_id");
   else
     FireRefreshTokenAvailable("account_id");
   // TODO(atwilson): Maybe we should also call FireRefreshTokensLoaded() here?
@@ skipping 40 matching lines @@
   std::vector<FakeProfileOAuth2TokenService::PendingRequest> requests =
       GetPendingRequests();
   // Walk the requests and notify the callbacks.
   for (std::vector<PendingRequest>::iterator it = pending_requests_.begin();
        it != pending_requests_.end(); ++it) {
     if (it->request && (all_scopes || it->scopes == scope))
       it->request->InformConsumer(error, access_token, expiration);
   }
 }
 
-std::string FakeProfileOAuth2TokenService::GetRefreshToken() {
+std::string FakeProfileOAuth2TokenService::GetRefreshToken(
+    const std::string& account_id) {
   return refresh_token_;
 }
 
 net::URLRequestContextGetter*
 FakeProfileOAuth2TokenService::GetRequestContext() {
   return NULL;
 }
 
 std::vector<FakeProfileOAuth2TokenService::PendingRequest>
 FakeProfileOAuth2TokenService::GetPendingRequests() {
   std::vector<PendingRequest> valid_requests;
   for (std::vector<PendingRequest>::iterator it = pending_requests_.begin();
        it != pending_requests_.end(); ++it) {
     if (it->request)
       valid_requests.push_back(*it);
   }
   return valid_requests;
 }
 
 void FakeProfileOAuth2TokenService::FetchOAuth2Token(
     RequestImpl* request,
+    const std::string& account_id,
     net::URLRequestContextGetter* getter,
     const std::string& client_id,
     const std::string& client_secret,
     const ScopeSet& scopes) {
   PendingRequest pending_request;
+  pending_request.account_id = account_id;
   pending_request.client_id = client_id;
   pending_request.client_secret = client_secret;
   pending_request.scopes = scopes;
   pending_request.request = request->AsWeakPtr();
   pending_requests_.push_back(pending_request);
 }