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

chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc

Index: chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
index e85fc26e4606237430fd53a470352c9b05c8ac5a..a1aced1d22688bc9f0d36381a5226902b983118b 100644
--- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
+++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
@@ -43,6 +43,8 @@ const char kGetRefreshTokenResponseFormat[] =
     "  \"refresh_token\": \"%s\""
     "}";
 
+const char kAccountId[] = "account_id";

[Bernhard Bauer, 2013/09/03 21:18:38]

Can you move this up to the first block of constants? Those are the constants
for the client.

[fgorski, 2013/09/03 22:03:05]

Done.

+
 // Utility methods --------------------------------------------------
 
 // Slightly hacky way to extract a value from a URL-encoded POST request body.
@@ -112,6 +114,7 @@ class ManagedUserRefreshTokenFetcherTest : public testing::Test {
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
   FakeProfileOAuth2TokenService oauth2_token_service_;
+  std::string account_id_;
   net::TestURLFetcherFactory url_fetcher_factory_;
   scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher_;
 
@@ -121,9 +124,11 @@ class ManagedUserRefreshTokenFetcherTest : public testing::Test {
 };
 
 ManagedUserRefreshTokenFetcherTest::ManagedUserRefreshTokenFetcherTest()
-    : token_fetcher_(
+    : account_id_(kAccountId),
+      token_fetcher_(
           ManagedUserRefreshTokenFetcher::Create(&oauth2_token_service_,
-                                          profile_.GetRequestContext())),
+                                                 account_id_,

[Bernhard Bauer, 2013/09/03 21:18:38]

If we don't care about the account ID otherwise, you could just pass the
constant here directly.

[fgorski, 2013/09/03 22:03:05]

Done.

+                                                 profile_.GetRequestContext())),
       error_(GoogleServiceAuthError::NONE),
       weak_ptr_factory_(this) {}