Index: chrome/browser/sync/glue/extension_setting_data_type_controller.cc |
diff --git a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc |
index 0c1268b01dc422d115cd4d60e3e0b7f5002ec776..51b26f276333290495c41cf3aa824d39e9b81a00 100644 |
--- a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc |
+++ b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc |
@@ -19,23 +19,14 @@ namespace browser_sync { |
ExtensionSettingDataTypeController::ExtensionSettingDataTypeController( |
syncer::ModelType type, |
- const base::Closure& error_callback, |
+ const base::Closure& dump_stack, |
sync_driver::SyncClient* sync_client, |
Profile* profile) |
- : NonUIDataTypeController( |
- BrowserThread::GetTaskRunnerForThread(BrowserThread::UI), |
- error_callback, |
- sync_client), |
- type_(type), |
+ : NonUIDataTypeController(type, dump_stack, sync_client), |
profile_(profile) { |
- DCHECK_CURRENTLY_ON(BrowserThread::UI); |
DCHECK(type == syncer::EXTENSION_SETTINGS || type == syncer::APP_SETTINGS); |
} |
-syncer::ModelType ExtensionSettingDataTypeController::type() const { |
- return type_; |
-} |
- |
syncer::ModelSafeGroup |
ExtensionSettingDataTypeController::model_safe_group() const { |
return syncer::GROUP_FILE; |
@@ -46,12 +37,12 @@ ExtensionSettingDataTypeController::~ExtensionSettingDataTypeController() {} |
bool ExtensionSettingDataTypeController::PostTaskOnBackendThread( |
const tracked_objects::Location& from_here, |
const base::Closure& task) { |
- DCHECK_CURRENTLY_ON(BrowserThread::UI); |
+ DCHECK(CalledOnValidThread()); |
return BrowserThread::PostTask(BrowserThread::FILE, from_here, task); |
} |
bool ExtensionSettingDataTypeController::StartModels() { |
- DCHECK_CURRENTLY_ON(BrowserThread::UI); |
+ DCHECK(CalledOnValidThread()); |
extensions::ExtensionSystem::Get(profile_)->InitForRegularProfile(true); |
return true; |
} |