| Index: components/sync/driver/glue/sync_backend_host_core.h
|
| diff --git a/components/sync_driver/glue/sync_backend_host_core.h b/components/sync/driver/glue/sync_backend_host_core.h
|
| similarity index 94%
|
| rename from components/sync_driver/glue/sync_backend_host_core.h
|
| rename to components/sync/driver/glue/sync_backend_host_core.h
|
| index 4e8bf43d4771ed23a5febc34a07e633d056291da..1fc734898c4d288b1f9cc78a6349bff9aa49d5cf 100644
|
| --- a/components/sync_driver/glue/sync_backend_host_core.h
|
| +++ b/components/sync/driver/glue/sync_backend_host_core.h
|
| @@ -18,9 +18,9 @@
|
| #include "components/sync/base/cancelation_signal.h"
|
| #include "components/sync/core/shutdown_reason.h"
|
| #include "components/sync/core/sync_encryption_handler.h"
|
| +#include "components/sync/driver/glue/sync_backend_host_impl.h"
|
| +#include "components/sync/driver/system_encryptor.h"
|
| #include "components/sync/sessions/type_debug_info_observer.h"
|
| -#include "components/sync_driver/glue/sync_backend_host_impl.h"
|
| -#include "components/sync_driver/system_encryptor.h"
|
| #include "url/gurl.h"
|
|
|
| namespace browser_sync {
|
| @@ -56,7 +56,7 @@ struct DoInitializeOptions {
|
|
|
| base::MessageLoop* sync_loop;
|
| SyncBackendRegistrar* registrar;
|
| - std::vector<scoped_refptr<syncer::ModelSafeWorker> > workers;
|
| + std::vector<scoped_refptr<syncer::ModelSafeWorker>> workers;
|
| scoped_refptr<syncer::ExtensionsActivity> extensions_activity;
|
| syncer::WeakHandle<syncer::JsEventHandler> event_handler;
|
| GURL service_url;
|
| @@ -99,9 +99,9 @@ class SyncBackendHostCore
|
| public syncer::TypeDebugInfoObserver {
|
| public:
|
| SyncBackendHostCore(const std::string& name,
|
| - const base::FilePath& sync_data_folder_path,
|
| - bool has_sync_setup_completed,
|
| - const base::WeakPtr<SyncBackendHostImpl>& backend);
|
| + const base::FilePath& sync_data_folder_path,
|
| + bool has_sync_setup_completed,
|
| + const base::WeakPtr<SyncBackendHostImpl>& backend);
|
|
|
| // SyncManager::Observer implementation. The Core just acts like an air
|
| // traffic controller here, forwarding incoming messages to appropriate
|
| @@ -207,15 +207,14 @@ class SyncBackendHostCore
|
| syncer::ConfigureReason reason,
|
| const DoConfigureSyncerTypes& config_types,
|
| const syncer::ModelSafeRoutingInfo routing_info,
|
| - const base::Callback<void(syncer::ModelTypeSet,
|
| - syncer::ModelTypeSet)>& ready_task,
|
| + const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
|
| + ready_task,
|
| const base::Closure& retry_callback);
|
| void DoFinishConfigureDataTypes(
|
| syncer::ModelTypeSet types_to_config,
|
| - const base::Callback<void(syncer::ModelTypeSet,
|
| - syncer::ModelTypeSet)>& ready_task);
|
| - void DoRetryConfiguration(
|
| - const base::Closure& retry_callback);
|
| + const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
|
| + ready_task);
|
| + void DoRetryConfiguration(const base::Closure& retry_callback);
|
|
|
| // Set the base request context to use when making HTTP calls.
|
| // This method will add a reference to the context to persist it
|
| @@ -249,7 +248,7 @@ class SyncBackendHostCore
|
| syncer::ModelTypeSet types,
|
| scoped_refptr<base::SequencedTaskRunner> task_runner,
|
| base::Callback<void(const std::vector<syncer::ModelType>& type,
|
| - ScopedVector<base::ListValue>) > callback);
|
| + ScopedVector<base::ListValue>)> callback);
|
|
|
| // Tell the sync manager to persist its state by writing to disk.
|
| // Called on the sync thread, both by a timer and, on Android, when the
|
|
|