Expose ReconcilorState. Rename MergeSession in Signin Tracker.

chrome/browser/signin/signin_tracker_unittest.cc

 // Copyright (c) 2012 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 "components/signin/core/browser/signin_tracker.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 27 matching lines @@
 
 namespace {
 
 class MockObserver : public SigninTracker::Observer {
  public:
   MockObserver() {}
   ~MockObserver() {}
 
   MOCK_METHOD1(SigninFailed, void(const GoogleServiceAuthError&));
   MOCK_METHOD0(SigninSuccess, void(void));
-  MOCK_METHOD1(MergeSessionComplete, void(const GoogleServiceAuthError&));
+  MOCK_METHOD1(AccountAddedToCookie, void(const GoogleServiceAuthError&));
 };
 
 }  // namespace
 
 class SigninTrackerTest : public testing::Test {
  public:
   SigninTrackerTest() {}
   void SetUp() override {
     TestingProfile::Builder builder;
     builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
@@ skipping 56 matching lines @@
   AccountTrackerService* service =
     AccountTrackerServiceFactory::GetForProfile(profile_.get());
   std::string gaia_id = "gaia_id";
   std::string email = "user@gmail.com";
   std::string account_id = service->SeedAccountInfo(gaia_id, email);
 
   mock_signin_manager_->SetAuthenticatedAccountInfo(gaia_id, email);
   fake_oauth2_token_service_->IssueRefreshTokenForUser(account_id,
                                                        "refresh_token");
 }