| Index: chrome/browser/sync/glue/non_frontend_data_type_controller.cc
|
| diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
|
| index 584a4c3108eb7a3626f0713f35e636276a9e1e08..febf2b65405639766cc4f927bed37ceebcd8f95f 100644
|
| --- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
|
| +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
|
| @@ -160,7 +160,7 @@ NonFrontendDataTypeController::NonFrontendDataTypeController(
|
| scoped_refptr<base::SingleThreadTaskRunner> ui_thread,
|
| const base::Closure& error_callback,
|
| sync_driver::SyncClient* sync_client)
|
| - : DataTypeController(ui_thread, error_callback),
|
| + : DirectoryDataTypeController(ui_thread, error_callback),
|
| state_(NOT_RUNNING),
|
| sync_client_(sync_client),
|
| model_associator_(NULL),
|
| @@ -293,13 +293,13 @@ void NonFrontendDataTypeController::OnSingleDataTypeUnrecoverableError(
|
| }
|
|
|
| NonFrontendDataTypeController::NonFrontendDataTypeController()
|
| - : DataTypeController(base::ThreadTaskRunnerHandle::Get(), base::Closure()),
|
| + : DirectoryDataTypeController(base::ThreadTaskRunnerHandle::Get(),
|
| + base::Closure()),
|
| state_(NOT_RUNNING),
|
| sync_client_(NULL),
|
| model_associator_(NULL),
|
| change_processor_(NULL),
|
| - weak_ptr_factory_(this) {
|
| -}
|
| + weak_ptr_factory_(this) {}
|
|
|
| NonFrontendDataTypeController::~NonFrontendDataTypeController() {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|