Revert 222154 "sync: Gracefully handle very early shutdown"

trunk/src/sync/internal_api/sync_manager_impl.cc

Index: trunk/src/sync/internal_api/sync_manager_impl.cc
===================================================================
--- trunk/src/sync/internal_api/sync_manager_impl.cc	(revision 222204)
+++ trunk/src/sync/internal_api/sync_manager_impl.cc	(working copy)
@@ -19,7 +19,6 @@
 #include "sync/engine/sync_scheduler.h"
 #include "sync/engine/syncer_types.h"
 #include "sync/internal_api/change_reorder_buffer.h"
-#include "sync/internal_api/public/base/cancelation_signal.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base_node.h"
 #include "sync/internal_api/public/configure_reason.h"
@@ -355,14 +354,12 @@
     Encryptor* encryptor,
     scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
     ReportUnrecoverableErrorFunction report_unrecoverable_error_function,
-    bool use_oauth2_token,
-    CancelationSignal* cancelation_signal) {
+    bool use_oauth2_token) {
   CHECK(!initialized_);
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(post_factory.get());
   DCHECK(!credentials.email.empty());
   DCHECK(!credentials.sync_token.empty());
-  DCHECK(cancelation_signal);
   DVLOG(1) << "SyncManager starting Init...";
 
   weak_handle_this_ = MakeWeakHandle(weak_ptr_factory_.GetWeakPtr());
@@ -422,7 +419,7 @@
 
   connection_manager_.reset(new SyncAPIServerConnectionManager(
       sync_server_and_path, port, use_ssl, use_oauth2_token,
-      post_factory.release(), cancelation_signal));
+      post_factory.release()));
   connection_manager_->set_client_id(directory()->cache_guid());
   connection_manager_->AddListener(this);
 
@@ -450,7 +447,7 @@
       invalidator_client_id).Pass();
   session_context_->set_account_name(credentials.email);
   scheduler_ = internal_components_factory->BuildScheduler(
-      name_, session_context_.get(), cancelation_signal).Pass();
+      name_, session_context_.get()).Pass();
 
   scheduler_->Start(SyncScheduler::CONFIGURATION_MODE);
 
@@ -621,6 +618,13 @@
   observers_.RemoveObserver(observer);
 }
 
+void SyncManagerImpl::StopSyncingForShutdown() {
+  DVLOG(2) << "StopSyncingForShutdown";
+  scheduler_->RequestStop();
+  if (connection_manager_)
+    connection_manager_->TerminateAllIO();
+}
+
 void SyncManagerImpl::ShutdownOnSyncThread() {
   DCHECK(thread_checker_.CalledOnValidThread());