| Index: sync/internal_api/sync_manager_impl.h
|
| diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
|
| index ae8d95623e74c3a95887fd17fbdf483abe747466..d9e0069aeb7bb7cd48fc313ac61d21c015f47f2c 100644
|
| --- a/sync/internal_api/sync_manager_impl.h
|
| +++ b/sync/internal_api/sync_manager_impl.h
|
| @@ -29,6 +29,8 @@
|
| #include "sync/util/cryptographer.h"
|
| #include "sync/util/time.h"
|
|
|
| +class GURL;
|
| +
|
| namespace syncer {
|
|
|
| class ModelTypeRegistry;
|
| @@ -69,9 +71,7 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl
|
| 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,
|
| @@ -83,8 +83,7 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl
|
| 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 ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
|
| virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
|
|
|