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

chrome/browser/managed_mode/managed_user_refresh_token_fetcher_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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/managed_mode/managed_user_refresh_token_fetcher.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 25 matching lines @@
     "  \"code\": \"%s\""
     "}";
 
 const char kGetRefreshTokenResponseFormat[] =
     "{"
     "  \"access_token\": \"<ignored>\","
     "  \"expires_in\": 12345,"
     "  \"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.
 bool GetValueForKey(const std::string& encoded_string,
                     const std::string& key,
                     std::string* value) {
   GURL url("http://example.com/?" + encoded_string);
   return net::GetValueForKeyInQuery(url, key, value);
 }
 
@@ skipping 49 matching lines @@
   const GoogleServiceAuthError& error() const { return error_; }
   const std::string& token() const { return token_; }
 
  private:
   void OnTokenFetched(const GoogleServiceAuthError& error,
                       const std::string& token);
 
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
   FakeProfileOAuth2TokenService oauth2_token_service_;
+  std::string account_id_;
   net::TestURLFetcherFactory url_fetcher_factory_;
   scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher_;
 
   GoogleServiceAuthError error_;
   std::string token_;
   base::WeakPtrFactory<ManagedUserRefreshTokenFetcherTest> weak_ptr_factory_;
 };
 
 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) {}
 
 void ManagedUserRefreshTokenFetcherTest::StartFetching() {
   oauth2_token_service_.IssueRefreshToken(kOAuth2RefreshToken);
   token_fetcher_->Start(kManagedUserId, kDeviceName,
                         base::Bind(
                             &ManagedUserRefreshTokenFetcherTest::OnTokenFetched,
                             weak_ptr_factory_.GetWeakPtr()));
 }
@@ skipping 205 matching lines @@
 
 TEST_F(ManagedUserRefreshTokenFetcherTest, CancelWhileFetchingRefreshToken) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
   MakeIssueTokenRequestSucceed();
   Reset();
 
   EXPECT_EQ(GoogleServiceAuthError::NONE, error().state());
   EXPECT_EQ(std::string(), token());
 }