chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 881203003: Suppress sequence checks in SyncFileSystem on the shutdown phase

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 881203003: Suppress sequence checks in SyncFileSystem on the shutdown phase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: +param comment Created 5 years, 11 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/extensions/api/sync_file_system/sync_file_system_browsertest.cc ('k') | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.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 4c2b47315f35819132e9aeabf27e6aaa7cb98032..84ffaf19e445a83aeda3bf7f3a4f62f6f225cf19 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

@@ -70,9 +70,10 @@ class ConflictResolverTest : public testing::Test {

context_.reset(new SyncEngineContext(fake_drive_service.Pass(),

drive_uploader.Pass(),

- nullptr,

+ nullptr /* task_logger */,

base::ThreadTaskRunnerHandle::Get(),

- base::ThreadTaskRunnerHandle::Get()));

+ base::ThreadTaskRunnerHandle::Get(),

+ nullptr /* worker_pool */));

context_->SetRemoteChangeProcessor(remote_change_processor_.get());

RegisterSyncableFileSystem();

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

sync_task_manager_.reset(new SyncTaskManager(

base::WeakPtr<SyncTaskManager::Client>(),

10 /* maximum_background_task */,

- base::ThreadTaskRunnerHandle::Get()));

+ base::ThreadTaskRunnerHandle::Get(),

+ nullptr /* worker_pool */));

sync_task_manager_->Initialize(SYNC_STATUS_OK);

}