Revert 222154 "sync: Gracefully handle very early shutdown"

trunk/src/sync/internal_api/syncapi_server_connection_manager.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SYNC_INTERNAL_API_SYNCAPI_SERVER_CONNECTION_MANAGER_H_
 #define SYNC_INTERNAL_API_SYNCAPI_SERVER_CONNECTION_MANAGER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #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;
 
 // This provides HTTP Post functionality through the interface provided
 // to the sync API by the application hosting the syncer backend.
 class SyncAPIBridgedConnection : public ServerConnectionManager::Connection {
  public:
   SyncAPIBridgedConnection(ServerConnectionManager* scm,
                            HttpPostProviderFactory* factory);
 
@@ skipping 20 matching lines @@
 // subclass so that we can override MakePost() to generate a POST object using
 // an instance of the HttpPostProviderFactory class.
 class SYNC_EXPORT_PRIVATE SyncAPIServerConnectionManager
     : public ServerConnectionManager {
  public:
   // Takes ownership of factory.
   SyncAPIServerConnectionManager(const std::string& server,
                                  int port,
                                  bool use_ssl,
                                  bool use_oauth2_token,
-                                 HttpPostProviderFactory* factory,
-                                 CancelationSignal* cancelation_signal);
+                                 HttpPostProviderFactory* factory);
   virtual ~SyncAPIServerConnectionManager();
 
   // ServerConnectionManager overrides.
-  virtual scoped_ptr<Connection> MakeConnection() OVERRIDE;
+  virtual Connection* MakeConnection() OVERRIDE;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(
-      SyncAPIServerConnectionManagerTest, VeryEarlyAbortPost);
   FRIEND_TEST_ALL_PREFIXES(SyncAPIServerConnectionManagerTest, EarlyAbortPost);
   FRIEND_TEST_ALL_PREFIXES(SyncAPIServerConnectionManagerTest, AbortPost);
 
   // A factory creating concrete HttpPostProviders for use whenever we need to
   // issue a POST to sync servers.
   scoped_ptr<HttpPostProviderFactory> post_provider_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncAPIServerConnectionManager);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_SYNCAPI_SERVER_CONNECTION_MANAGER_H_