| Index: components/sync/driver/ui_model_type_controller.cc
|
| diff --git a/components/sync/driver/ui_model_type_controller.cc b/components/sync/driver/ui_model_type_controller.cc
|
| index 7e42040cb60f7314df9229dce971269e990ca682..d817061317aea3060bdb1c493285c5dff45c1b48 100644
|
| --- a/components/sync/driver/ui_model_type_controller.cc
|
| +++ b/components/sync/driver/ui_model_type_controller.cc
|
| @@ -13,30 +13,19 @@ namespace sync_driver_v2 {
|
|
|
| using sync_driver::SyncClient;
|
|
|
| -UIModelTypeController::UIModelTypeController(
|
| - const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
|
| - const base::Closure& error_callback,
|
| - syncer::ModelType model_type,
|
| - SyncClient* sync_client)
|
| - : NonBlockingDataTypeController(ui_thread,
|
| - error_callback,
|
| - model_type,
|
| - sync_client) {}
|
| +UIModelTypeController::UIModelTypeController(syncer::ModelType type,
|
| + const base::Closure& dump_stack,
|
| + SyncClient* sync_client)
|
| + : NonBlockingDataTypeController(type, dump_stack, sync_client) {}
|
|
|
| UIModelTypeController::~UIModelTypeController() {}
|
|
|
| bool UIModelTypeController::RunOnModelThread(
|
| const tracked_objects::Location& from_here,
|
| const base::Closure& task) {
|
| - RunOnUIThread(from_here, task);
|
| - return true;
|
| -}
|
| -
|
| -void UIModelTypeController::RunOnUIThread(
|
| - const tracked_objects::Location& from_here,
|
| - const base::Closure& task) {
|
| - DCHECK(BelongsToUIThread());
|
| + DCHECK(CalledOnValidThread());
|
| task.Run();
|
| + return true;
|
| }
|
|
|
| } // namespace sync_driver_v2
|
|
|