chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 297803011: [SyncFS] Run LocalToRemoteSyncer 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 297803011: [SyncFS] Run LocalToRemoteSyncer as SyncTask (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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 | « no previous file | chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h » ('j') | chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc » ('J')
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 3869b79eeec498af926e41626ed3a3734474969d..1cfe3524f3dc9f2386a3881dee6593b5400cdfcb 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

@@ -22,6 +22,7 @@

#include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"

#include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h"

#include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"

+#include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"

#include "chrome/browser/sync_file_system/fake_remote_change_processor.h"

#include "chrome/browser/sync_file_system/sync_file_system_test_util.h"

#include "chrome/browser/sync_file_system/syncable_file_system_util.h"

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

context_.get(),

SyncFileMetadata(file_change.file_type(), 0, base::Time()),

file_change, local_path, url));

- syncer->RunExclusive(CreateResultReceiver(&status));

+ syncer->RunPreflight(SyncTaskToken::CreateForTesting(

+ CreateResultReceiver(&status)));

base::RunLoop().RunUntilIdle();

if (status == SYNC_STATUS_OK)

remote_change_processor_->ClearLocalChanges(url);