| Index: components/sync/driver/directory_data_type_controller.cc
|
| diff --git a/components/sync/driver/directory_data_type_controller.cc b/components/sync/driver/directory_data_type_controller.cc
|
| index 19cada916b7f4e6d44d7f24d1bdfbd2c4810ad67..cb75cd58843c8d2852cf89e406a0b1bc234bbbf7 100644
|
| --- a/components/sync/driver/directory_data_type_controller.cc
|
| +++ b/components/sync/driver/directory_data_type_controller.cc
|
| @@ -5,6 +5,7 @@
|
| #include "components/sync/driver/directory_data_type_controller.h"
|
|
|
| #include <utility>
|
| +#include <vector>
|
|
|
| #include "base/memory/ptr_util.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| @@ -18,8 +19,11 @@ namespace syncer {
|
| DirectoryDataTypeController::DirectoryDataTypeController(
|
| ModelType type,
|
| const base::Closure& dump_stack,
|
| - SyncClient* sync_client)
|
| - : DataTypeController(type, dump_stack), sync_client_(sync_client) {}
|
| + SyncClient* sync_client,
|
| + ModelSafeGroup model_safe_group)
|
| + : DataTypeController(type, dump_stack),
|
| + sync_client_(sync_client),
|
| + model_safe_group_(model_safe_group) {}
|
|
|
| DirectoryDataTypeController::~DirectoryDataTypeController() {}
|
|
|
| @@ -51,7 +55,7 @@ void DirectoryDataTypeController::GetStatusCounters(
|
| num_entries_by_type[type()] - num_to_delete_entries_by_type[type()];
|
|
|
| callback.Run(type(), counters);
|
| -};
|
| +}
|
|
|
| void DirectoryDataTypeController::RegisterWithBackend(
|
| BackendDataTypeConfigurer* configurer) {}
|
| @@ -61,7 +65,7 @@ void DirectoryDataTypeController::ActivateDataType(
|
| DCHECK(CalledOnValidThread());
|
| // Tell the backend about the change processor for this type so it can
|
| // begin routing changes to it.
|
| - configurer->ActivateDirectoryDataType(type(), model_safe_group(),
|
| + configurer->ActivateDirectoryDataType(type(), model_safe_group_,
|
| GetChangeProcessor());
|
| }
|
|
|
|
|