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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

Issue 363373003: Replace MessageLoopProxy::current() with ThreadTaskRunnerHandle::Get() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 | Annotate | Revision Log
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/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/thread_task_runner_handle.h"
12 #include "chrome/browser/drive/drive_uploader.h" 13 #include "chrome/browser/drive/drive_uploader.h"
13 #include "chrome/browser/drive/fake_drive_service.h" 14 #include "chrome/browser/drive/fake_drive_service.h"
14 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h" 15 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h"
15 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util. h" 16 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util. h"
16 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h" 17 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h"
17 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h" 18 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h"
18 #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h" 19 #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h"
19 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h " 20 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h "
20 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" 21 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
21 #include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h " 22 #include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h "
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 fake_drive_helper_.reset( 66 fake_drive_helper_.reset(
66 new FakeDriveServiceHelper(fake_drive_service.get(), 67 new FakeDriveServiceHelper(fake_drive_service.get(),
67 drive_uploader.get(), 68 drive_uploader.get(),
68 kSyncRootFolderTitle)); 69 kSyncRootFolderTitle));
69 remote_change_processor_.reset(new FakeRemoteChangeProcessor); 70 remote_change_processor_.reset(new FakeRemoteChangeProcessor);
70 71
71 context_.reset(new SyncEngineContext( 72 context_.reset(new SyncEngineContext(
72 fake_drive_service.PassAs<drive::DriveServiceInterface>(), 73 fake_drive_service.PassAs<drive::DriveServiceInterface>(),
73 drive_uploader.Pass(), 74 drive_uploader.Pass(),
74 NULL, 75 NULL,
75 base::MessageLoopProxy::current(), 76 base::ThreadTaskRunnerHandle::Get(),
76 base::MessageLoopProxy::current(), 77 base::ThreadTaskRunnerHandle::Get(),
77 base::MessageLoopProxy::current())); 78 base::ThreadTaskRunnerHandle::Get()));
78 context_->SetRemoteChangeProcessor(remote_change_processor_.get()); 79 context_->SetRemoteChangeProcessor(remote_change_processor_.get());
79 80
80 RegisterSyncableFileSystem(); 81 RegisterSyncableFileSystem();
81 82
82 sync_task_manager_.reset(new SyncTaskManager( 83 sync_task_manager_.reset(new SyncTaskManager(
83 base::WeakPtr<SyncTaskManager::Client>(), 84 base::WeakPtr<SyncTaskManager::Client>(),
84 10 /* maximum_background_task */, 85 10 /* maximum_background_task */,
85 base::MessageLoopProxy::current())); 86 base::ThreadTaskRunnerHandle::Get()));
86 sync_task_manager_->Initialize(SYNC_STATUS_OK); 87 sync_task_manager_->Initialize(SYNC_STATUS_OK);
87 } 88 }
88 89
89 virtual void TearDown() OVERRIDE { 90 virtual void TearDown() OVERRIDE {
90 sync_task_manager_.reset(); 91 sync_task_manager_.reset();
91 RevokeSyncableFileSystem(); 92 RevokeSyncableFileSystem();
92 fake_drive_helper_.reset(); 93 fake_drive_helper_.reset();
93 context_.reset(); 94 context_.reset();
94 base::RunLoop().RunUntilIdle(); 95 base::RunLoop().RunUntilIdle();
95 } 96 }
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 513
513 EXPECT_EQ(4, CountParents(file)); 514 EXPECT_EQ(4, CountParents(file));
514 515
515 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); 516 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());
516 517
517 EXPECT_EQ(1, CountParents(file)); 518 EXPECT_EQ(1, CountParents(file));
518 } 519 }
519 520
520 } // namespace drive_backend 521 } // namespace drive_backend
521 } // namespace sync_file_system 522 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698