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

chrome/browser/sync/test_profile_sync_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 182 matching lines @@
   bool set_initial_sync_ended_on_init_;
 
   bool fail_initial_download_;
   syncer::StorageOption storage_option_;
 };
 
 
 class FakeOAuth2TokenService : public ProfileOAuth2TokenService {
  public:
   virtual scoped_ptr<OAuth2TokenService::Request> StartRequest(
+      const std::string& account_id,
       const OAuth2TokenService::ScopeSet& scopes,
       OAuth2TokenService::Consumer* consumer) OVERRIDE;
 
   static BrowserContextKeyedService* BuildTokenService(
       content::BrowserContext* context);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_