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

chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc

Index: chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
diff --git a/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc b/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
index 6c1336edabfc10fdf364bd046a0d142006f7d76b..4f86dc7ccdc02394bc41f6095b331d81e9265bea 100644
--- a/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
+++ b/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
@@ -82,7 +82,8 @@ class MockProfileOAuth2TokenService : public ProfileOAuth2TokenService {
   virtual ~MockProfileOAuth2TokenService();
 
   virtual scoped_ptr<OAuth2TokenService::Request> StartRequest(
-      const std::set<std::string>& scopes,
+      const std::string& account_id,
+      const OAuth2TokenService::ScopeSet& scopes,
       OAuth2TokenService::Consumer* consumer) OVERRIDE;
 
   void SetExpectation(bool success, std::string oauth2_access_token);
@@ -122,8 +123,9 @@ MockProfileOAuth2TokenService::MockProfileOAuth2TokenService()
 MockProfileOAuth2TokenService::~MockProfileOAuth2TokenService() {
 }
 
-void MockProfileOAuth2TokenService::SetExpectation(bool success,
-                                            std::string oauth2_access_token) {
+void MockProfileOAuth2TokenService::SetExpectation(
+    bool success,
+    std::string oauth2_access_token) {
   success_ = success;
   oauth2_access_token_ = oauth2_access_token;
 }
@@ -137,7 +139,8 @@ void MockProfileOAuth2TokenService::InformConsumer(
 
 scoped_ptr<OAuth2TokenService::Request>
     MockProfileOAuth2TokenService::StartRequest(
-        const std::set<std::string>& scopes,
+        const std::string& account_id,
+        const OAuth2TokenService::ScopeSet& scopes,
         OAuth2TokenService::Consumer* consumer) {
   scoped_ptr<Request> request;
   if (success_) {
@@ -196,7 +199,8 @@ TEST_F(ProfileOAuth2TokenServiceRequestTest,
   scoped_ptr<ProfileOAuth2TokenServiceRequest> request(
       ProfileOAuth2TokenServiceRequest::CreateAndStart(
           profile_.get(),
-          std::set<std::string>(),
+          std::string(),
+          OAuth2TokenService::ScopeSet(),
           &consumer_));
   ui_loop_.RunUntilIdle();
   EXPECT_EQ(0, consumer_.number_of_successful_tokens_);
@@ -208,7 +212,8 @@ TEST_F(ProfileOAuth2TokenServiceRequestTest,
   scoped_ptr<ProfileOAuth2TokenServiceRequest> request(
       ProfileOAuth2TokenServiceRequest::CreateAndStart(
           profile_.get(),
-          std::set<std::string>(),
+          std::string(),
+          OAuth2TokenService::ScopeSet(),
           &consumer_));
   ui_loop_.RunUntilIdle();
   EXPECT_EQ(1, consumer_.number_of_successful_tokens_);
@@ -221,7 +226,8 @@ TEST_F(ProfileOAuth2TokenServiceRequestTest,
   scoped_ptr<ProfileOAuth2TokenServiceRequest> request(
       ProfileOAuth2TokenServiceRequest::CreateAndStart(
           profile_.get(),
-          std::set<std::string>(),
+          std::string(),
+          OAuth2TokenService::ScopeSet(),
           &consumer_));
   request.reset();
   ui_loop_.RunUntilIdle();
@@ -234,7 +240,8 @@ TEST_F(ProfileOAuth2TokenServiceRequestTest,
   scoped_ptr<ProfileOAuth2TokenServiceRequest> request(
       ProfileOAuth2TokenServiceRequest::CreateAndStart(
           profile_.get(),
-          std::set<std::string>(),
+          std::string(),
+          OAuth2TokenService::ScopeSet(),
           &consumer_));
   ui_loop_.RunUntilIdle();
   request.reset();