Revert 222154 "sync: Gracefully handle very early shutdown"

trunk/src/sync/internal_api/syncapi_server_connection_manager.cc

 // Copyright (c) 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.
 
 #include "sync/internal_api/syncapi_server_connection_manager.h"
 
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
 #include "sync/internal_api/public/http_post_provider_factory.h"
 #include "sync/internal_api/public/http_post_provider_interface.h"
@@ skipping 74 matching lines @@
 void SyncAPIBridgedConnection::Abort() {
   DCHECK(post_provider_);
   post_provider_->Abort();
 }
 
 SyncAPIServerConnectionManager::SyncAPIServerConnectionManager(
     const std::string& server,
     int port,
     bool use_ssl,
     bool use_oauth2_token,
-    HttpPostProviderFactory* factory,
-    CancelationSignal* cancelation_signal)
-    : ServerConnectionManager(server,
-                              port,
-                              use_ssl,
-                              use_oauth2_token,
-                              cancelation_signal),
+    HttpPostProviderFactory* factory)
+    : ServerConnectionManager(server, port, use_ssl, use_oauth2_token),
       post_provider_factory_(factory) {
   DCHECK(post_provider_factory_.get());
 }
 
 SyncAPIServerConnectionManager::~SyncAPIServerConnectionManager() {}
 
-scoped_ptr<ServerConnectionManager::Connection>
+ServerConnectionManager::Connection*
 SyncAPIServerConnectionManager::MakeConnection() {
-  return scoped_ptr<Connection>(
-      new SyncAPIBridgedConnection(this, post_provider_factory_.get()));
+  return new SyncAPIBridgedConnection(this, post_provider_factory_.get());
 }
 
 }  // namespace syncer