chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 302003013: [SyncFS] Run V2 backend tasks as SyncTask

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 302003013: [SyncFS] Run V2 backend tasks as SyncTask (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 6 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/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 889a8a11df9e3d41be97b9f467bb2c2b567aa044..827335d4cf59592c92a1fd58543551620d061079 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

@@ -215,7 +215,8 @@ class ConflictResolverTest : public testing::Test {

SyncStatusCode RunConflictResolver() {

SyncStatusCode status = SYNC_STATUS_UNKNOWN;

ConflictResolver resolver(context_.get());

- resolver.RunExclusive(CreateResultReceiver(&status));

+ resolver.RunPreflight(SyncTaskToken::CreateForTesting(

+ CreateResultReceiver(&status)));

base::RunLoop().RunUntilIdle();

return status;

}