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

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 109f3a311eba3c84fac3d3a6f9b3299ac8de7fce..d37c1d26ab9020fefb724413a6aaa255edf6c55d 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -365,7 +365,8 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
     // Process robot refresh token store.
     EXPECT_EQ(
         "refreshToken4Test",
-        chromeos::DeviceOAuth2TokenServiceFactory::Get()->GetRefreshToken());
+        chromeos::DeviceOAuth2TokenServiceFactory::Get()->GetRefreshToken(

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

The fact that there's this unnecessary account_id parameter to
DeviceOAuth2TokenService indicates that we don't quite have the right level of
abstraction - I think the API would have been cleaner if we'd gone down the path
of having separate OAuth2TokenServices per signed-in account (so each O2TS is
inherently tied to a specific account ID).

But I'm OK with this change as-is -- it's workable and we can always do some
future refactoring if this turns out to be cumbersome.

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

Done. Using GetDeviceAccountId().

+            std::string()));
   }
 
   bool is_auto_enrollment_;