Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side 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, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h" 5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 scoped_ptr<drive::DriveUploaderInterface> 63 scoped_ptr<drive::DriveUploaderInterface>
64 drive_uploader(new FakeDriveUploader(fake_drive_service.get())); 64 drive_uploader(new FakeDriveUploader(fake_drive_service.get()));
65 fake_drive_helper_.reset( 65 fake_drive_helper_.reset(
66 new FakeDriveServiceHelper(fake_drive_service.get(), 66 new FakeDriveServiceHelper(fake_drive_service.get(),
67 drive_uploader.get(), 67 drive_uploader.get(),
68 kSyncRootFolderTitle)); 68 kSyncRootFolderTitle));
69 remote_change_processor_.reset(new FakeRemoteChangeProcessor); 69 remote_change_processor_.reset(new FakeRemoteChangeProcessor);
70 70
71 context_.reset(new SyncEngineContext(fake_drive_service.Pass(), 71 context_.reset(new SyncEngineContext(fake_drive_service.Pass(),
72 drive_uploader.Pass(), 72 drive_uploader.Pass(),
73 nullptr, 73 nullptr /* task_logger */,
74 base::ThreadTaskRunnerHandle::Get(), 74 base::ThreadTaskRunnerHandle::Get(),
75 base::ThreadTaskRunnerHandle::Get())); 75 base::ThreadTaskRunnerHandle::Get(),
76 nullptr /* worker_pool */));
76 context_->SetRemoteChangeProcessor(remote_change_processor_.get()); 77 context_->SetRemoteChangeProcessor(remote_change_processor_.get());
77 78
78 RegisterSyncableFileSystem(); 79 RegisterSyncableFileSystem();
79 80
80 sync_task_manager_.reset(new SyncTaskManager( 81 sync_task_manager_.reset(new SyncTaskManager(
81 base::WeakPtr<SyncTaskManager::Client>(), 82 base::WeakPtr<SyncTaskManager::Client>(),
82 10 /* maximum_background_task */, 83 10 /* maximum_background_task */,
83 base::ThreadTaskRunnerHandle::Get())); 84 base::ThreadTaskRunnerHandle::Get(),
85 nullptr /* worker_pool */));
84 sync_task_manager_->Initialize(SYNC_STATUS_OK); 86 sync_task_manager_->Initialize(SYNC_STATUS_OK);
85 } 87 }
86 88
87 void TearDown() override { 89 void TearDown() override {
88 sync_task_manager_.reset(); 90 sync_task_manager_.reset();
89 RevokeSyncableFileSystem(); 91 RevokeSyncableFileSystem();
90 fake_drive_helper_.reset(); 92 fake_drive_helper_.reset();
91 context_.reset(); 93 context_.reset();
92 base::RunLoop().RunUntilIdle(); 94 base::RunLoop().RunUntilIdle();
93 } 95 }
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 519
518 EXPECT_EQ(4, CountParents(file)); 520 EXPECT_EQ(4, CountParents(file));
519 521
520 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); 522 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());
521 523
522 EXPECT_EQ(1, CountParents(file)); 524 EXPECT_EQ(1, CountParents(file));
523 } 525 }
524 526
525 } // namespace drive_backend 527 } // namespace drive_backend
526 } // namespace sync_file_system 528 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698