Expose ReconcilorState. Rename MergeSession in Signin Tracker.

chrome/browser/ui/sync/one_click_signin_sync_starter_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 "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 112 matching lines @@
 
 // Verifies that the continue URL is loaded once signin completes.
 TEST_F(OneClickSigninSyncStarterTest, LoadContinueUrl) {
   content::NavigationController& controller = web_contents()->GetController();
   EXPECT_FALSE(controller.GetPendingEntry());
 
   const GURL kTestURL = GURL("http://www.example.com");
   CreateSyncStarter(base::Bind(&OneClickSigninSyncStarterTest::Callback,
                                base::Unretained(this)),
                     kTestURL);
-  sync_starter_->MergeSessionComplete(
+  sync_starter_->AccountAddedToCookie(
       GoogleServiceAuthError(GoogleServiceAuthError::NONE));
   EXPECT_EQ(1, succeeded_count_);
   EXPECT_EQ(kTestURL, controller.GetPendingEntry()->GetURL());
 }