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

chrome/browser/policy/cloud/user_policy_signin_service_unittest.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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
@@ skipping 87 matching lines @@
   explicit FakeAndroidProfileOAuth2TokenService(Profile* profile) {
     Initialize(profile);
   }
 
   static BrowserContextKeyedService* Build(content::BrowserContext* profile) {
     return new FakeAndroidProfileOAuth2TokenService(
         static_cast<Profile*>(profile));
   }
 
   // AndroidProfileOAuth2TokenService overrides:
-  virtual void FetchOAuth2TokenWithUsername(
+  virtual void FetchOAuth2Token(
       RequestImpl* request,
-      const std::string& username,
+      const std::string& account_id,
+      net::URLRequestContextGetter* getter,
+      const std::string& client_id,
+      const std::string& client_secret,
       const OAuth2TokenService::ScopeSet& scope) OVERRIDE {
     ASSERT_TRUE(!HasPendingRequest());
-    ASSERT_EQ(kTestUser, username);
+    ASSERT_EQ(kTestUser, account_id);
     ASSERT_EQ(2U, scope.size());
     EXPECT_EQ(1U, scope.count(GaiaConstants::kDeviceManagementServiceOAuth));
     EXPECT_EQ(1U, scope.count(
         "https://www.googleapis.com/auth/userinfo.email"));
     pending_request_ = request->AsWeakPtr();
   }
 
   void IssueToken(const std::string& token) {
     ASSERT_TRUE(HasPendingRequest());
     GoogleServiceAuthError error = GoogleServiceAuthError::AuthErrorNone();
@@ skipping 715 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(manager_->IsClientRegistered());
 #if !defined(OS_ANDROID)
   EXPECT_FALSE(signin_manager_->IsSignoutProhibited());
 #endif
 }
 
 }  // namespace
 
 }  // namespace policy