Expose ReconcilorState. Rename MergeSession in Signin Tracker.

components/signin/core/browser/signin_tracker.h

 // 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.
 
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_TRACKER_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_TRACKER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "components/signin/core/browser/gaia_cookie_manager_service.h"
 #include "components/signin/core/browser/signin_manager.h"
@@ skipping 46 matching lines @@
   class Observer {
    public:
     // The signin attempt failed, and the cause is passed in |error|.
     virtual void SigninFailed(const GoogleServiceAuthError& error) = 0;
 
     // The signin attempt succeeded.
     virtual void SigninSuccess() = 0;
 
     // The signed in account has been added into the content area cookie jar.
     // This will be called only after a call to SigninSuccess().
-    virtual void MergeSessionComplete(const GoogleServiceAuthError& error) = 0;
+    virtual void AccountAddedToCookie(const GoogleServiceAuthError& error) = 0;
   };
 
   // Creates a SigninTracker that tracks the signin status on the passed
   // classes, and notifies the |observer| on status changes. All of the
   // instances with the exception of |account_reconcilor| must be non-null and
   // must outlive the SigninTracker. |account_reconcilor| will be used if it is
   // non-null.
   SigninTracker(ProfileOAuth2TokenService* token_service,
                 SigninManagerBase* signin_manager,
                 GaiaCookieManagerService* cookie_manager_service,
@@ skipping 25 matching lines @@
   // The client associated with this instance.
   SigninClient* client_;
 
   // Weak pointer to the observer we call when the signin state changes.
   Observer* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninTracker);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_TRACKER_H_