Revert 222154 "sync: Gracefully handle very early shutdown"

trunk/src/sync/engine/syncer_unittest.cc

Index: trunk/src/sync/engine/syncer_unittest.cc
===================================================================
--- trunk/src/sync/engine/syncer_unittest.cc	(revision 222204)
+++ trunk/src/sync/engine/syncer_unittest.cc	(working copy)
@@ -30,7 +30,6 @@
 #include "sync/engine/syncer.h"
 #include "sync/engine/syncer_proto_util.h"
 #include "sync/engine/traffic_recorder.h"
-#include "sync/internal_api/public/base/cancelation_signal.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
@@ -229,7 +228,7 @@
             false,  // force enable pre-commit GU avoidance experiment
             "fake_invalidator_client_id"));
     context_->set_routing_info(routing_info);
-    syncer_ = new Syncer(&cancelation_signal_);
+    syncer_ = new Syncer();
 
     syncable::ReadTransaction trans(FROM_HERE, directory());
     syncable::Directory::Metahandles children;
@@ -552,7 +551,6 @@
   FakeEncryptor encryptor_;
   scoped_refptr<ExtensionsActivity> extensions_activity_;
   scoped_ptr<MockConnectionManager> mock_server_;
-  CancelationSignal cancelation_signal_;
 
   Syncer* syncer_;