chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc - Issue 1104153002: Expose ReconcilorState. Rename MergeSession in Signin Tracker.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc

Issue 1104153002: Expose ReconcilorState. Rename MergeSession in Signin Tracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: VLOGging the reconcilor Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter.cc ('k') | chrome/browser/ui/webui/signin/login_ui_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc

diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc

index 571f62421bc0e3a88ffe666eba617ec3f23e2742..a2720e7ff9069a4db9b6f457da41883c127a9f91 100644

--- a/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc

+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc

@@ -130,7 +130,7 @@ TEST_F(OneClickSigninSyncStarterTest, LoadContinueUrl) {

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());

« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter.cc ('k') | chrome/browser/ui/webui/signin/login_ui_test_utils.cc » ('j') | no next file with comments »