Componentize AccountReconcilor.

chrome/browser/signin/account_reconcilor_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/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
-#include "chrome/browser/signin/account_reconcilor.h"
 #include "chrome/browser/signin/account_reconcilor_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/browser/account_reconcilor.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kTestEmail[] = "user@gmail.com";
 
 class MockAccountReconcilor : public testing::StrictMock<AccountReconcilor> {
  public:
   static KeyedService* Build(content::BrowserContext* context);
 
-  explicit MockAccountReconcilor(Profile* profile, SigninClient* client);
+  MockAccountReconcilor(ProfileOAuth2TokenService* token_service,
+                        SigninManager* signin_manager,
+                        SigninClient* client);
   virtual ~MockAccountReconcilor() {}
 
   MOCK_METHOD1(PerformMergeAction, void(const std::string& account_id));
   MOCK_METHOD1(StartRemoveAction, void(const std::string& account_id));
   MOCK_METHOD3(
       FinishRemoveAction,
       void(const std::string& account_id,
            const GoogleServiceAuthError& error,
            const std::vector<std::pair<std::string, bool> >& accounts));
   MOCK_METHOD2(PerformAddToChromeAction, void(const std::string& account_id,
                                               int session_index));
   MOCK_METHOD0(PerformLogoutAllAccountsAction, void());
 };
 
 // static
 KeyedService* MockAccountReconcilor::Build(content::BrowserContext* context) {
   Profile* profile = Profile::FromBrowserContext(context);
   AccountReconcilor* reconcilor = new MockAccountReconcilor(
-      profile, ChromeSigninClientFactory::GetForProfile(profile));
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
+      SigninManagerFactory::GetForProfile(profile),
+      ChromeSigninClientFactory::GetForProfile(profile));
   reconcilor->Initialize(false /* start_reconcile_if_tokens_available */);
   return reconcilor;
 }
 
-MockAccountReconcilor::MockAccountReconcilor(Profile* profile,
-                                             SigninClient* client)
-    : testing::StrictMock<AccountReconcilor>(profile, client) {}
+MockAccountReconcilor::MockAccountReconcilor(
+    ProfileOAuth2TokenService* token_service,
+    SigninManager* signin_manager,
+    SigninClient* client)
+    : testing::StrictMock<AccountReconcilor>(token_service,
+                                             signin_manager,
+                                             client) {}
 
 }  // namespace
 
 class AccountReconcilorTest : public testing::Test {
  public:
   AccountReconcilorTest();
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   TestingProfile* profile() { return profile_.get(); }
@@ skipping 79 matching lines @@
     AccountReconcilor* reconcilor,
     const std::string& account_id,
     const std::string& refresh_token) {
   reconcilor->HandleRefreshTokenFetched(account_id, refresh_token);
 }
 
 TEST_F(AccountReconcilorTest, Basic) {
   AccountReconcilor* reconcilor =
       AccountReconcilorFactory::GetForProfile(profile());
   ASSERT_TRUE(reconcilor);
-  ASSERT_EQ(profile(), reconcilor->profile());
+  ASSERT_EQ(token_service(), reconcilor->token_service());
 }
 
 #if !defined(OS_CHROMEOS)
 
 TEST_F(AccountReconcilorTest, SigninManagerRegistration) {
   AccountReconcilor* reconcilor =
       AccountReconcilorFactory::GetForProfile(profile());
   ASSERT_TRUE(reconcilor);
   ASSERT_FALSE(reconcilor->IsPeriodicReconciliationRunning());
   ASSERT_FALSE(reconcilor->IsRegisteredWithTokenService());
@@ skipping 383 matching lines @@
   token_service()->IssueAllTokensForAccount("user@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
   token_service()->IssueAllTokensForAccount("other@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
 
   base::RunLoop().RunUntilIdle();
   SimulateMergeSessionCompleted(reconcilor, "user@gmail.com",
                                 GoogleServiceAuthError::AuthErrorNone());
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
 }