chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 98043004: [SyncFS] Run ConflictResolver only when it is needed.

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/sync_file_system/drive_backend/conflict_resolver_unittest.cc

Issue 98043004: [SyncFS] Run ConflictResolver only when it is needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test expectation Created 7 years 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/sync_file_system/drive_backend/conflict_resolver.cc ('k') | chrome/browser/sync_file_system/drive_backend/list_changes_task.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

index b7aa41c0c31441023a25aa3948e2066be291e9e1..1ca3bcdcff657780d4a8b46acbcaedc923a56bbc 100644

--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

@@ -239,7 +239,7 @@ TEST_F(ConflictResolverTest, NoFileToBeResolved) {

RegisterApp(kOrigin.host(), app_root);

RunSyncerUntilIdle();

- EXPECT_EQ(SYNC_STATUS_NO_CHANGE_TO_SYNC, RunConflictResolver());

+ EXPECT_EQ(SYNC_STATUS_NO_CONFLICT, RunConflictResolver());

}

TEST_F(ConflictResolverTest, ResolveConflict_Files) {