summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/syncapi_server_connection_manager.h
diff options
context:
space:
mode:
Diffstat (limited to 'sync/internal_api/syncapi_server_connection_manager.h')
-rw-r--r--sync/internal_api/syncapi_server_connection_manager.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/sync/internal_api/syncapi_server_connection_manager.h b/sync/internal_api/syncapi_server_connection_manager.h
index 74312b3..8ce8dbb 100644
--- a/sync/internal_api/syncapi_server_connection_manager.h
+++ b/sync/internal_api/syncapi_server_connection_manager.h
@@ -12,9 +12,11 @@
#include "base/memory/scoped_ptr.h"
#include "sync/base/sync_export.h"
#include "sync/engine/net/server_connection_manager.h"
+#include "sync/internal_api/public/base/cancelation_signal.h"
namespace syncer {
+class ConnectionDisconnectHandle;
class HttpPostProviderFactory;
class HttpPostProviderInterface;
@@ -55,13 +57,16 @@ class SYNC_EXPORT_PRIVATE SyncAPIServerConnectionManager
int port,
bool use_ssl,
bool use_oauth2_token,
- HttpPostProviderFactory* factory);
+ HttpPostProviderFactory* factory,
+ CancelationSignal* cancelation_signal);
virtual ~SyncAPIServerConnectionManager();
// ServerConnectionManager overrides.
- virtual Connection* MakeConnection() OVERRIDE;
+ virtual scoped_ptr<Connection> MakeConnection() OVERRIDE;
private:
+ FRIEND_TEST_ALL_PREFIXES(
+ SyncAPIServerConnectionManagerTest, VeryEarlyAbortPost);
FRIEND_TEST_ALL_PREFIXES(SyncAPIServerConnectionManagerTest, EarlyAbortPost);
FRIEND_TEST_ALL_PREFIXES(SyncAPIServerConnectionManagerTest, AbortPost);