| Index: sync/internal_api/sync_rollback_manager.h
|
| diff --git a/sync/internal_api/sync_rollback_manager.h b/sync/internal_api/sync_rollback_manager.h
|
| index fed4fd403c76136c85f80ebd1236381af4552488..ee7144725e9ff96bfe1abc814e9c71be6ed5c5f9 100644
|
| --- a/sync/internal_api/sync_rollback_manager.h
|
| +++ b/sync/internal_api/sync_rollback_manager.h
|
| @@ -10,6 +10,8 @@
|
|
|
| #include "sync/internal_api/sync_rollback_manager_base.h"
|
|
|
| +class GURL;
|
| +
|
| namespace syncer {
|
|
|
| // SyncRollbackManager restores user's data to pre-sync state using backup
|
| @@ -23,9 +25,7 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManager : public SyncRollbackManagerBase {
|
| virtual void Init(
|
| const base::FilePath& database_location,
|
| const WeakHandle<JsEventHandler>& event_handler,
|
| - const std::string& sync_server_and_path,
|
| - int sync_server_port,
|
| - bool use_ssl,
|
| + const GURL& service_url,
|
| scoped_ptr<HttpPostProviderFactory> post_factory,
|
| const std::vector<scoped_refptr<ModelSafeWorker> >& workers,
|
| ExtensionsActivity* extensions_activity,
|
| @@ -37,8 +37,7 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManager : public SyncRollbackManagerBase {
|
| InternalComponentsFactory* internal_components_factory,
|
| Encryptor* encryptor,
|
| scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
|
| - ReportUnrecoverableErrorFunction
|
| - report_unrecoverable_error_function,
|
| + ReportUnrecoverableErrorFunction report_unrecoverable_error_function,
|
| CancelationSignal* cancelation_signal) OVERRIDE;
|
| virtual void StartSyncingNormally(
|
| const ModelSafeRoutingInfo& routing_info) OVERRIDE;
|
|
|