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

chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.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/chromeos/settings/device_oauth2_token_service.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/common/pref_names.h"
@@ skipping 61 matching lines @@
   // Local State (if the value is an empty string, it will be ignored).
   void SetUpDefaultValues() {
     cryptohome_library_.reset(chromeos::CryptohomeLibrary::GetTestImpl());
     chromeos::CryptohomeLibrary::SetForTest(cryptohome_library_.get());
     SetDeviceRefreshTokenInLocalState("device_refresh_token_4_test");
     oauth2_service_.SetRobotAccountIdPolicyValue("service_acct@g.com");
     AssertConsumerTokensAndErrors(0, 0);
   }
 
   scoped_ptr<OAuth2TokenService::Request> StartTokenRequest() {
-    return oauth2_service_.StartRequest(std::set<std::string>(), &consumer_);
+    return oauth2_service_.StartRequest(
+        std::string(), std::set<std::string>(), &consumer_);
   }
 
   virtual void TearDown() OVERRIDE {
     CryptohomeLibrary::SetForTest(NULL);
     base::RunLoop().RunUntilIdle();
   }
 
   // Utility method to set a value in Local State for the device refresh token
   // (it must have a non-empty value or it won't be used).
   void SetDeviceRefreshTokenInLocalState(const std::string& refresh_token) {
@@ skipping 62 matching lines @@
       .WillOnce(Return(""));
   EXPECT_CALL(mock_cryptohome_library,
               EncryptWithSystemSalt(StrEq("test-token")))
       .Times(1)
       .WillOnce(Return("encrypted"));
   EXPECT_CALL(mock_cryptohome_library,
               DecryptWithSystemSalt(StrEq("encrypted")))
       .Times(1)
       .WillOnce(Return("test-token"));
 
-  ASSERT_EQ("", oauth2_service_.GetRefreshToken());
+  ASSERT_EQ("", oauth2_service_.GetRefreshToken(std::string()));

[Andrew T Wilson (Slow), 2013/08/30 10:47:00]

Would be really nice if DeviceOAuth2TokenService() exposed something like
GetDeviceAccountID() and we used that instead of an empty string for all these.

[fgorski, 2013/08/30 20:10:16]

Done. Went with GetDeviceAccountId (over ID) for API consistency.

   oauth2_service_.SetAndSaveRefreshToken("test-token");
-  ASSERT_EQ("test-token", oauth2_service_.GetRefreshToken());
+  ASSERT_EQ("test-token", oauth2_service_.GetRefreshToken(std::string()));
 
   // This call won't invoke decrypt again, since the value is cached.
-  ASSERT_EQ("test-token", oauth2_service_.GetRefreshToken());
+  ASSERT_EQ("test-token", oauth2_service_.GetRefreshToken(std::string()));
 }
 
 TEST_F(DeviceOAuth2TokenServiceTest, RefreshTokenValidation_Success) {
   SetUpDefaultValues();
   scoped_ptr<OAuth2TokenService::Request> request = StartTokenRequest();
 
   ReturnOAuthUrlFetchResults(
       kValidatorUrlFetcherId,
       net::HTTP_OK,
       GetValidTokenResponse("tokeninfo_access_token", 3600));
@@ skipping 178 matching lines @@
       kValidatorUrlFetcherId,
       net::HTTP_OK,
       GetValidTokenInfoResponse("service_acct@g.com"));
 
   // All fetches were successful, but consumer still given error since
   // the token owner doesn't match the policy value.
   AssertConsumerTokensAndErrors(0, 1);
 }
 
 }  // namespace chromeos