| 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 7b4d11c5ed9e160d751fa0bf969ea755b1f5aca4..1170277525b39534c5f8176e94dab5f8196c07fd 100644
|
| --- a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc
|
| +++ b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc
|
| @@ -19,7 +19,7 @@ using content::BrowserThread;
|
| namespace browser_sync {
|
|
|
| ExtensionSettingDataTypeController::ExtensionSettingDataTypeController(
|
| - syncable::ModelType type,
|
| + syncer::ModelType type,
|
| ProfileSyncComponentsFactory* profile_sync_factory,
|
| Profile* profile,
|
| ProfileSyncService* profile_sync_service)
|
| @@ -30,11 +30,10 @@ ExtensionSettingDataTypeController::ExtensionSettingDataTypeController(
|
| profile_(profile),
|
| profile_sync_service_(profile_sync_service) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - DCHECK(type == syncable::EXTENSION_SETTINGS ||
|
| - type == syncable::APP_SETTINGS);
|
| + DCHECK(type == syncer::EXTENSION_SETTINGS || type == syncer::APP_SETTINGS);
|
| }
|
|
|
| -syncable::ModelType ExtensionSettingDataTypeController::type() const {
|
| +syncer::ModelType ExtensionSettingDataTypeController::type() const {
|
| return type_;
|
| }
|
|
|
|
|