Expose ReconcilorState. Rename MergeSession in Signin Tracker.

chrome/browser/ui/sync/one_click_signin_sync_starter.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_
 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 111 matching lines @@
 
   ~OneClickSigninSyncStarter() override;
 
   // Initializes the internals of the OneClickSigninSyncStarter object. Can also
   // be used to re-initialize the object to refer to a newly created profile.
   void Initialize(Profile* profile, Browser* browser);
 
   // SigninTracker::Observer override.
   void SigninFailed(const GoogleServiceAuthError& error) override;
   void SigninSuccess() override;
-  void MergeSessionComplete(const GoogleServiceAuthError& error) override;
+  void AccountAddedToCookie(const GoogleServiceAuthError& error) override;
 
   // LoginUIService::Observer override.
   void OnSyncConfirmationUIClosed(bool configure_sync_first) override;
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // User input handler for the signin confirmation dialog.
   class SigninDialogDelegate
     : public ui::ProfileSigninConfirmationDelegate {
    public:
     SigninDialogDelegate(
@@ skipping 94 matching lines @@
   std::string client_id_;
 #endif
 
   base::WeakPtrFactory<OneClickSigninSyncStarter> weak_pointer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninSyncStarter);
 };
 
 
 #endif  // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_