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..f9ad79af0f5d85213839c834b136c6d6f8ceaa73 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
@@ -43,7 +43,6 @@ class TestDeviceOAuth2TokenService : public DeviceOAuth2TokenService {
     robot_account_id_ = id;
   }
 
- protected:
   // Skip calling into the policy subsystem and return our test value.
   virtual std::string GetRobotAccountId() OVERRIDE {
     return robot_account_id_;
@@ -79,7 +78,9 @@ class DeviceOAuth2TokenServiceTest : public testing::Test {
   }
 
   scoped_ptr<OAuth2TokenService::Request> StartTokenRequest() {
-    return oauth2_service_.StartRequest(std::set<std::string>(), &consumer_);
+    return oauth2_service_.StartRequest(oauth2_service_.GetRobotAccountId(),
+                                        std::set<std::string>(),
+                                        &consumer_);
   }
 
   virtual void TearDown() OVERRIDE {
@@ -162,12 +163,15 @@ TEST_F(DeviceOAuth2TokenServiceTest, SaveEncryptedToken) {
       .Times(1)
       .WillOnce(Return("test-token"));
 
-  ASSERT_EQ("", oauth2_service_.GetRefreshToken());
+  ASSERT_EQ("", oauth2_service_.GetRefreshToken(
+                    oauth2_service_.GetRobotAccountId()));
   oauth2_service_.SetAndSaveRefreshToken("test-token");
-  ASSERT_EQ("test-token", oauth2_service_.GetRefreshToken());
+  ASSERT_EQ("test-token", oauth2_service_.GetRefreshToken(
+                              oauth2_service_.GetRobotAccountId()));
 
   // 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(
+                              oauth2_service_.GetRobotAccountId()));
 }
 
 TEST_F(DeviceOAuth2TokenServiceTest, RefreshTokenValidation_Success) {