| Index: components/sync/driver/frontend_data_type_controller.h
|
| diff --git a/components/sync_driver/frontend_data_type_controller.h b/components/sync/driver/frontend_data_type_controller.h
|
| similarity index 94%
|
| rename from components/sync_driver/frontend_data_type_controller.h
|
| rename to components/sync/driver/frontend_data_type_controller.h
|
| index ec875c6e5d2aa81c1be51efad9846fc7e5e000b9..d5b6ad6a8e09c02eed332febb5e055038f2971bf 100644
|
| --- a/components/sync_driver/frontend_data_type_controller.h
|
| +++ b/components/sync/driver/frontend_data_type_controller.h
|
| @@ -12,7 +12,7 @@
|
| #include "base/macros.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "components/sync/core/data_type_error_handler.h"
|
| -#include "components/sync_driver/directory_data_type_controller.h"
|
| +#include "components/sync/driver/directory_data_type_controller.h"
|
|
|
| namespace base {
|
| class SingleThreadTaskRunner;
|
| @@ -85,10 +85,9 @@ class FrontendDataTypeController
|
| virtual void CleanUpState();
|
|
|
| // Helper method for cleaning up state and running the start callback.
|
| - virtual void StartDone(
|
| - ConfigureResult start_result,
|
| - const syncer::SyncMergeResult& local_merge_result,
|
| - const syncer::SyncMergeResult& syncer_merge_result);
|
| + virtual void StartDone(ConfigureResult start_result,
|
| + const syncer::SyncMergeResult& local_merge_result,
|
| + const syncer::SyncMergeResult& syncer_merge_result);
|
|
|
| // Record association time.
|
| virtual void RecordAssociationTime(base::TimeDelta time);
|
|
|