| Index: components/sync_driver/data_type_controller.h
|
| diff --git a/components/sync_driver/data_type_controller.h b/components/sync_driver/data_type_controller.h
|
| index 3c75fa4307c286fd061dc0d699c18cc0bf449e55..bd8d62cd021f409f6c2cb2bc08d8f8b1803fe7cf 100644
|
| --- a/components/sync_driver/data_type_controller.h
|
| +++ b/components/sync_driver/data_type_controller.h
|
| @@ -13,8 +13,8 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/ref_counted_delete_on_message_loop.h"
|
| #include "base/sequenced_task_runner_helpers.h"
|
| -#include "components/sync_driver/data_type_error_handler.h"
|
| #include "sync/internal_api/public/base/model_type.h"
|
| +#include "sync/internal_api/public/data_type_error_handler.h"
|
| #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
|
|
|
| namespace base {
|
| @@ -33,7 +33,7 @@ class BackendDataTypeConfigurer;
|
| // need to run model associator or change processor on other threads.
|
| class DataTypeController
|
| : public base::RefCountedDeleteOnMessageLoop<DataTypeController>,
|
| - public DataTypeErrorHandler {
|
| + public syncer::DataTypeErrorHandler {
|
| public:
|
| enum State {
|
| NOT_RUNNING, // The controller has never been started or has previously
|
|
|