Expose ReconcilorState. Rename MergeSession in Signin Tracker.

chrome/browser/ui/webui/signin/login_ui_test_utils.cc

 // Copyright 2014 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 "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/signin/signin_tracker_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 37 matching lines @@
 
   void SigninFailed(const GoogleServiceAuthError& error) override {
     DVLOG(1) << "Google signin failed.";
     seen_ = true;
     if (!running_)
       return;
     message_loop_runner_->Quit();
     running_ = false;
   }
 
-  void MergeSessionComplete(const GoogleServiceAuthError& error) override {}
+  void AccountAddedToCookie(const GoogleServiceAuthError& error) override {}
 
   void SigninSuccess() override {
     DVLOG(1) << "Google signin succeeded.";
     seen_ = true;
     signed_in_ = true;
     if (!running_)
       return;
     message_loop_runner_->Quit();
     running_ = false;
   }
@@ skipping 73 matching lines @@
 
   DVLOG(1) << "Wait for login UI to be ready.";
   WaitUntilUIReady(browser);
   DVLOG(1) << "Sign in user: " << username;
   ExecuteJsToSigninInSigninFrame(browser, username, password);
   signin_observer.Wait();
   return signin_observer.DidSignIn();
 }
 
 }  // namespace login_ui_test_utils