| Index: sync/internal_api/syncapi_server_connection_manager.cc
|
| diff --git a/sync/internal_api/syncapi_server_connection_manager.cc b/sync/internal_api/syncapi_server_connection_manager.cc
|
| index 224d579a22a0a6b21c92dd30489a1def208946f3..4c29f105f96633ac3fde0e74c787413949265d5e 100644
|
| --- a/sync/internal_api/syncapi_server_connection_manager.cc
|
| +++ b/sync/internal_api/syncapi_server_connection_manager.cc
|
| @@ -92,17 +92,23 @@ SyncAPIServerConnectionManager::SyncAPIServerConnectionManager(
|
| int port,
|
| bool use_ssl,
|
| bool use_oauth2_token,
|
| - HttpPostProviderFactory* factory)
|
| - : ServerConnectionManager(server, port, use_ssl, use_oauth2_token),
|
| + HttpPostProviderFactory* factory,
|
| + CancelationSignal* cancelation_signal)
|
| + : ServerConnectionManager(server,
|
| + port,
|
| + use_ssl,
|
| + use_oauth2_token,
|
| + cancelation_signal),
|
| post_provider_factory_(factory) {
|
| DCHECK(post_provider_factory_.get());
|
| }
|
|
|
| SyncAPIServerConnectionManager::~SyncAPIServerConnectionManager() {}
|
|
|
| -ServerConnectionManager::Connection*
|
| +scoped_ptr<ServerConnectionManager::Connection>
|
| SyncAPIServerConnectionManager::MakeConnection() {
|
| - return new SyncAPIBridgedConnection(this, post_provider_factory_.get());
|
| + return scoped_ptr<Connection>(
|
| + new SyncAPIBridgedConnection(this, post_provider_factory_.get()));
|
| }
|
|
|
| } // namespace syncer
|
|
|