Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/sync_engine.h" | 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h" |
| 6 | 6 |
|
peria
2014/07/04 05:28:03
add #include "base/thread_task_runner_handle.h" ?
tzik
2014/07/04 05:58:13
Done.
That was from callback_helper.h.
| |
| 7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "chrome/browser/drive/drive_uploader.h" | 10 #include "chrome/browser/drive/drive_uploader.h" |
| 11 #include "chrome/browser/drive/fake_drive_service.h" | 11 #include "chrome/browser/drive/fake_drive_service.h" |
| 12 #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h" | 12 #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h" |
| 13 #include "chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h" | 13 #include "chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h" |
| 14 #include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h" | 14 #include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h" |
| 15 #include "chrome/browser/sync_file_system/remote_file_sync_service.h" | 15 #include "chrome/browser/sync_file_system/remote_file_sync_service.h" |
| 16 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" | 16 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 30 virtual ~SyncEngineTest() {} | 30 virtual ~SyncEngineTest() {} |
| 31 | 31 |
| 32 virtual void SetUp() OVERRIDE { | 32 virtual void SetUp() OVERRIDE { |
| 33 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); | 33 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); |
| 34 | 34 |
| 35 scoped_ptr<drive::DriveServiceInterface> | 35 scoped_ptr<drive::DriveServiceInterface> |
| 36 fake_drive_service(new drive::FakeDriveService); | 36 fake_drive_service(new drive::FakeDriveService); |
| 37 | 37 |
| 38 worker_pool_ = new base::SequencedWorkerPool(1, "Worker"); | 38 worker_pool_ = new base::SequencedWorkerPool(1, "Worker"); |
| 39 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner = | 39 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner = |
| 40 base::MessageLoopProxy::current(); | 40 base::ThreadTaskRunnerHandle::Get(); |
| 41 worker_task_runner_ = | 41 worker_task_runner_ = |
| 42 worker_pool_->GetSequencedTaskRunnerWithShutdownBehavior( | 42 worker_pool_->GetSequencedTaskRunnerWithShutdownBehavior( |
| 43 worker_pool_->GetSequenceToken(), | 43 worker_pool_->GetSequenceToken(), |
| 44 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); | 44 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); |
| 45 | 45 |
| 46 sync_engine_.reset(new drive_backend::SyncEngine( | 46 sync_engine_.reset(new drive_backend::SyncEngine( |
| 47 ui_task_runner, | 47 ui_task_runner, |
| 48 worker_task_runner_, | 48 worker_task_runner_, |
| 49 NULL /* file_task_runner */, | 49 NULL /* file_task_runner */, |
| 50 NULL /* drive_task_runner */, | 50 NULL /* drive_task_runner */, |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 222 TEST_F(SyncEngineTest, ProcessRemoteChange) { | 222 TEST_F(SyncEngineTest, ProcessRemoteChange) { |
| 223 SyncStatusCode sync_status; | 223 SyncStatusCode sync_status; |
| 224 fileapi::FileSystemURL url; | 224 fileapi::FileSystemURL url; |
| 225 sync_engine()->ProcessRemoteChange(CreateResultReceiver(&sync_status, &url)); | 225 sync_engine()->ProcessRemoteChange(CreateResultReceiver(&sync_status, &url)); |
| 226 WaitForWorkerTaskRunner(); | 226 WaitForWorkerTaskRunner(); |
| 227 EXPECT_EQ(SYNC_STATUS_OK, sync_status); | 227 EXPECT_EQ(SYNC_STATUS_OK, sync_status); |
| 228 } | 228 } |
| 229 | 229 |
| 230 } // namespace drive_backend | 230 } // namespace drive_backend |
| 231 } // namespace sync_file_system | 231 } // namespace sync_file_system |
| OLD | NEW |