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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_worker_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_worker.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_worker.h"
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.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/extensions/test_extension_service.h" 13 #include "chrome/browser/extensions/test_extension_service.h"
13 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" 14 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
14 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" 15 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
15 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" 16 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
16 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h" 17 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
17 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" 18 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
18 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" 19 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
19 #include "content/public/test/test_browser_thread_bundle.h" 20 #include "content/public/test/test_browser_thread_bundle.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 110
110 extension_service_.reset(new MockExtensionService); 111 extension_service_.reset(new MockExtensionService);
111 scoped_ptr<drive::DriveServiceInterface> 112 scoped_ptr<drive::DriveServiceInterface>
112 fake_drive_service(new drive::FakeDriveService); 113 fake_drive_service(new drive::FakeDriveService);
113 114
114 scoped_ptr<SyncEngineContext> 115 scoped_ptr<SyncEngineContext>
115 sync_engine_context(new SyncEngineContext( 116 sync_engine_context(new SyncEngineContext(
116 fake_drive_service.Pass(), 117 fake_drive_service.Pass(),
117 scoped_ptr<drive::DriveUploaderInterface>(), 118 scoped_ptr<drive::DriveUploaderInterface>(),
118 NULL /* task_logger */, 119 NULL /* task_logger */,
119 base::MessageLoopProxy::current() /* ui_task_runner */, 120 base::ThreadTaskRunnerHandle::Get() /* ui_task_runner */,
120 base::MessageLoopProxy::current() /* worker_task_runner */, 121 base::ThreadTaskRunnerHandle::Get() /* worker_task_runner */,
121 base::MessageLoopProxy::current() /* file_task_runner */)); 122 base::ThreadTaskRunnerHandle::Get() /* file_task_runner */));
122 123
123 sync_worker_.reset(new SyncWorker( 124 sync_worker_.reset(new SyncWorker(
124 profile_dir_.path(), 125 profile_dir_.path(),
125 extension_service_->AsWeakPtr(), 126 extension_service_->AsWeakPtr(),
126 in_memory_env_.get())); 127 in_memory_env_.get()));
127 sync_worker_->Initialize(sync_engine_context.Pass()); 128 sync_worker_->Initialize(sync_engine_context.Pass());
128 129
129 sync_worker_->SetSyncEnabled(true); 130 sync_worker_->SetSyncEnabled(true);
130 base::RunLoop().RunUntilIdle(); 131 base::RunLoop().RunUntilIdle();
131 } 132 }
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 base::Bind(&SyncWorkerTest::CheckServiceState, 389 base::Bind(&SyncWorkerTest::CheckServiceState,
389 AsWeakPtr(), 390 AsWeakPtr(),
390 SYNC_STATUS_OK, 391 SYNC_STATUS_OK,
391 REMOTE_SERVICE_OK)); 392 REMOTE_SERVICE_OK));
392 393
393 base::RunLoop().RunUntilIdle(); 394 base::RunLoop().RunUntilIdle();
394 } 395 }
395 396
396 } // namespace drive_backend 397 } // namespace drive_backend
397 } // namespace sync_file_system 398 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698