| Index: sync/internal_api/sync_rollback_manager.cc
|
| diff --git a/sync/internal_api/sync_rollback_manager.cc b/sync/internal_api/sync_rollback_manager.cc
|
| index c5a6f75226574a5c15a49411f4dba6f51568164c..a26e54ec38a0db2907cd726a73b0d6e637a518f1 100644
|
| --- a/sync/internal_api/sync_rollback_manager.cc
|
| +++ b/sync/internal_api/sync_rollback_manager.cc
|
| @@ -11,6 +11,7 @@
|
| #include "sync/internal_api/public/write_transaction.h"
|
| #include "sync/syncable/directory.h"
|
| #include "sync/syncable/mutable_entry.h"
|
| +#include "url/gurl.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -22,25 +23,22 @@ SyncRollbackManager::~SyncRollbackManager() {
|
| }
|
|
|
| void SyncRollbackManager::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,
|
| - scoped_ptr<HttpPostProviderFactory> post_factory,
|
| - const std::vector<scoped_refptr<ModelSafeWorker> >& workers,
|
| - ExtensionsActivity* extensions_activity,
|
| - SyncManager::ChangeDelegate* change_delegate,
|
| - const SyncCredentials& credentials,
|
| - const std::string& invalidator_client_id,
|
| - const std::string& restored_key_for_bootstrapping,
|
| - const std::string& restored_keystore_key_for_bootstrapping,
|
| - InternalComponentsFactory* internal_components_factory,
|
| - Encryptor* encryptor,
|
| - scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
|
| - ReportUnrecoverableErrorFunction
|
| - report_unrecoverable_error_function,
|
| - CancelationSignal* cancelation_signal) {
|
| + const base::FilePath& database_location,
|
| + const WeakHandle<JsEventHandler>& event_handler,
|
| + const GURL& service_url,
|
| + scoped_ptr<HttpPostProviderFactory> post_factory,
|
| + const std::vector<scoped_refptr<ModelSafeWorker> >& workers,
|
| + ExtensionsActivity* extensions_activity,
|
| + SyncManager::ChangeDelegate* change_delegate,
|
| + const SyncCredentials& credentials,
|
| + const std::string& invalidator_client_id,
|
| + const std::string& restored_key_for_bootstrapping,
|
| + const std::string& restored_keystore_key_for_bootstrapping,
|
| + InternalComponentsFactory* internal_components_factory,
|
| + Encryptor* encryptor,
|
| + scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
|
| + ReportUnrecoverableErrorFunction report_unrecoverable_error_function,
|
| + CancelationSignal* cancelation_signal) {
|
| if (SyncRollbackManagerBase::InitInternal(
|
| database_location,
|
| internal_components_factory,
|
|
|