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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_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/sync_engine.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
6 6
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 "base/thread_task_runner_handle.h"
10 #include "chrome/browser/drive/drive_uploader.h" 11 #include "chrome/browser/drive/drive_uploader.h"
11 #include "chrome/browser/drive/fake_drive_service.h" 12 #include "chrome/browser/drive/fake_drive_service.h"
12 #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h" 13 #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h"
13 #include "chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h" 14 #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" 15 #include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h"
15 #include "chrome/browser/sync_file_system/remote_file_sync_service.h" 16 #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
16 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" 17 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
17 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
18 #include "content/public/test/test_browser_thread_bundle.h" 19 #include "content/public/test/test_browser_thread_bundle.h"
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 10 matching lines...) Expand all
30 virtual ~SyncEngineTest() {} 31 virtual ~SyncEngineTest() {}
31 32
32 virtual void SetUp() OVERRIDE { 33 virtual void SetUp() OVERRIDE {
33 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); 34 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
34 35
35 scoped_ptr<drive::DriveServiceInterface> 36 scoped_ptr<drive::DriveServiceInterface>
36 fake_drive_service(new drive::FakeDriveService); 37 fake_drive_service(new drive::FakeDriveService);
37 38
38 worker_pool_ = new base::SequencedWorkerPool(1, "Worker"); 39 worker_pool_ = new base::SequencedWorkerPool(1, "Worker");
39 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner = 40 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner =
40 base::MessageLoopProxy::current(); 41 base::ThreadTaskRunnerHandle::Get();
41 worker_task_runner_ = 42 worker_task_runner_ =
42 worker_pool_->GetSequencedTaskRunnerWithShutdownBehavior( 43 worker_pool_->GetSequencedTaskRunnerWithShutdownBehavior(
43 worker_pool_->GetSequenceToken(), 44 worker_pool_->GetSequenceToken(),
44 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); 45 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
45 46
46 sync_engine_.reset(new drive_backend::SyncEngine( 47 sync_engine_.reset(new drive_backend::SyncEngine(
47 ui_task_runner, 48 ui_task_runner,
48 worker_task_runner_, 49 worker_task_runner_,
49 NULL /* file_task_runner */, 50 NULL /* file_task_runner */,
50 NULL /* drive_task_runner */, 51 NULL /* drive_task_runner */,
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 TEST_F(SyncEngineTest, ProcessRemoteChange) { 223 TEST_F(SyncEngineTest, ProcessRemoteChange) {
223 SyncStatusCode sync_status; 224 SyncStatusCode sync_status;
224 fileapi::FileSystemURL url; 225 fileapi::FileSystemURL url;
225 sync_engine()->ProcessRemoteChange(CreateResultReceiver(&sync_status, &url)); 226 sync_engine()->ProcessRemoteChange(CreateResultReceiver(&sync_status, &url));
226 WaitForWorkerTaskRunner(); 227 WaitForWorkerTaskRunner();
227 EXPECT_EQ(SYNC_STATUS_OK, sync_status); 228 EXPECT_EQ(SYNC_STATUS_OK, sync_status);
228 } 229 }
229 230
230 } // namespace drive_backend 231 } // namespace drive_backend
231 } // namespace sync_file_system 232 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698