Chromium Code Reviews| Index: components/autofill/core/browser/webdata/autofill_data_type_controller.cc |
| diff --git a/components/autofill/core/browser/webdata/autofill_data_type_controller.cc b/components/autofill/core/browser/webdata/autofill_data_type_controller.cc |
| index 2082e9d274a7c94f03bfc0e3c0d17d794c68a941..6d875aac9ec3c04e1e871a6e5152922769627b3a 100644 |
| --- a/components/autofill/core/browser/webdata/autofill_data_type_controller.cc |
| +++ b/components/autofill/core/browser/webdata/autofill_data_type_controller.cc |
| @@ -14,43 +14,38 @@ |
| namespace browser_sync { |
| AutofillDataTypeController::AutofillDataTypeController( |
| - const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread, |
| const scoped_refptr<base::SingleThreadTaskRunner>& db_thread, |
| - const base::Closure& error_callback, |
| + const base::Closure& dump_stack, |
| sync_driver::SyncClient* sync_client, |
| const scoped_refptr<autofill::AutofillWebDataService>& web_data_service) |
| - : NonUIDataTypeController(ui_thread, error_callback, sync_client), |
| + : NonUIDataTypeController(syncer::AUTOFILL, dump_stack, sync_client), |
| db_thread_(db_thread), |
| web_data_service_(web_data_service) {} |
| -syncer::ModelType AutofillDataTypeController::type() const { |
|
skym
2016/09/02 22:45:28
Man, this was terrible. I'm so glad you're getting
maxbogue
2016/09/03 00:14:51
Me toooooo!
|
| - return syncer::AUTOFILL; |
| -} |
| - |
| syncer::ModelSafeGroup AutofillDataTypeController::model_safe_group() const { |
| return syncer::GROUP_DB; |
| } |
| void AutofillDataTypeController::WebDatabaseLoaded() { |
| - DCHECK(ui_thread()->BelongsToCurrentThread()); |
| + DCHECK(CalledOnValidThread()); |
| DCHECK_EQ(MODEL_STARTING, state()); |
| OnModelLoaded(); |
| } |
| AutofillDataTypeController::~AutofillDataTypeController() { |
| - DCHECK(ui_thread()->BelongsToCurrentThread()); |
| + DCHECK(CalledOnValidThread()); |
| } |
| bool AutofillDataTypeController::PostTaskOnBackendThread( |
| const tracked_objects::Location& from_here, |
| const base::Closure& task) { |
| - DCHECK(ui_thread()->BelongsToCurrentThread()); |
| + DCHECK(CalledOnValidThread()); |
| return db_thread_->PostTask(from_here, task); |
| } |
| bool AutofillDataTypeController::StartModels() { |
| - DCHECK(ui_thread()->BelongsToCurrentThread()); |
| + DCHECK(CalledOnValidThread()); |
| DCHECK_EQ(MODEL_STARTING, state()); |
| if (!web_data_service_) |
| @@ -59,8 +54,8 @@ bool AutofillDataTypeController::StartModels() { |
| if (web_data_service_->IsDatabaseLoaded()) { |
| return true; |
| } else { |
| - web_data_service_->RegisterDBLoadedCallback( |
| - base::Bind(&AutofillDataTypeController::WebDatabaseLoaded, this)); |
| + web_data_service_->RegisterDBLoadedCallback(base::Bind( |
| + &AutofillDataTypeController::WebDatabaseLoaded, base::AsWeakPtr(this))); |
| return false; |
| } |
| } |