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

chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc

Index: chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
index 98fed4e3000116e9b4aae87f923b252d59d59395..f61b45e7b5bd61525371867ac85824df6514fc02 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
@@ -79,7 +79,8 @@ class DeviceOAuth2TokenServiceTest : public testing::Test {
   }
 
   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 {
@@ -162,12 +163,12 @@ TEST_F(DeviceOAuth2TokenServiceTest, SaveEncryptedToken) {
       .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) {