Expose ReconcilorState. Rename MergeSession in Signin Tracker.

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/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/time.h"
@@ skipping 305 matching lines @@
   const std::string account_id =
       ConnectProfileToAccount("12345", "user@gmail.com");
   cookie_manager_service()->SetListAccountsResponseOneAccountWithExpiry(
       "user@gmail.com", true);
   EXPECT_CALL(*GetMockReconcilor(), PerformMergeAction(account_id));
 
   AccountReconcilor* reconcilor =
       AccountReconcilorFactory::GetForProfile(profile());
   ASSERT_TRUE(reconcilor);
 
+  ASSERT_EQ(AccountReconcilor::State::NOT_RECONCILING, reconcilor->GetState());
   reconcilor->StartReconcile();
+  ASSERT_EQ(AccountReconcilor::State::GATHERING_INFORMATION,
+            reconcilor->GetState());
   base::RunLoop().RunUntilIdle();
+  ASSERT_EQ(AccountReconcilor::State::APPLYING_CHANGES, reconcilor->GetState());
 
   std::vector<std::pair<std::string, bool> > accounts;
   ASSERT_TRUE(cookie_manager_service()->ListAccounts(&accounts));
   ASSERT_EQ(1u, accounts.size());
   ASSERT_EQ(account_id, accounts[0].first);
 }
 
 TEST_F(AccountReconcilorTest, GetAccountsFromCookieFailure) {
   ConnectProfileToAccount("12345", "user@gmail.com");
-  cookie_manager_service()->SetListAccountsResponseHttpNotFound();
+  cookie_manager_service()->SetListAccountsResponseWebLoginRequired();
 
   AccountReconcilor* reconcilor =
       AccountReconcilorFactory::GetForProfile(profile());
   ASSERT_TRUE(reconcilor);
 
+  ASSERT_EQ(AccountReconcilor::State::NOT_RECONCILING, reconcilor->GetState());
   reconcilor->StartReconcile();
+  ASSERT_EQ(AccountReconcilor::State::GATHERING_INFORMATION,
+            reconcilor->GetState());
   base::RunLoop().RunUntilIdle();
 
   std::vector<std::pair<std::string, bool> > accounts;
   ASSERT_FALSE(cookie_manager_service()->ListAccounts(&accounts));
   ASSERT_EQ(0u, accounts.size());
+
+  base::RunLoop().RunUntilIdle();
+  ASSERT_EQ(AccountReconcilor::State::NOT_RECONCILING_ERROR_OCCURED,
+            reconcilor->GetState());
 }
 
 TEST_P(AccountReconcilorTest, StartReconcileNoop) {
   const std::string account_id =
       ConnectProfileToAccount("12345", "user@gmail.com");
 
   AccountReconcilor* reconcilor =
       AccountReconcilorFactory::GetForProfile(profile());
   ASSERT_TRUE(reconcilor);
 
@@ skipping 386 matching lines @@
   ASSERT_TRUE(reconcilor->is_reconcile_started_);
 
   SimulateAddAccountToCookieCompleted(reconcilor, account_id,
                                       GoogleServiceAuthError::AuthErrorNone());
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
 }
 
 INSTANTIATE_TEST_CASE_P(AccountReconcilorMaybeEnabled,
                         AccountReconcilorTest,
                         testing::Bool());