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

chrome/browser/signin/ubertoken_fetcher_unittest.cc

Index: chrome/browser/signin/ubertoken_fetcher_unittest.cc
diff --git a/chrome/browser/signin/ubertoken_fetcher_unittest.cc b/chrome/browser/signin/ubertoken_fetcher_unittest.cc
index 569025a13b9dac7643c7996a8d5962ead943f20e..e6165bde9cc01fe85793082c28e5be737f866e76 100644
--- a/chrome/browser/signin/ubertoken_fetcher_unittest.cc
+++ b/chrome/browser/signin/ubertoken_fetcher_unittest.cc
@@ -43,7 +43,8 @@ class MockUbertokenConsumer : public UbertokenConsumer {
 class MockOAuth2TokenService : public ProfileOAuth2TokenService {
   // OAuth2TokenService overrides:
   virtual scoped_ptr<OAuth2TokenService::Request>
-      StartRequest(const OAuth2TokenService::ScopeSet& scopes,
+      StartRequest(const std::string& account_id,
+                   const OAuth2TokenService::ScopeSet& scopes,
                    OAuth2TokenService::Consumer* consumer) OVERRIDE {
     // Don't actually make a request.
     scoped_ptr<OAuth2TokenService::Request> request;