Revert 222154 "sync: Gracefully handle very early shutdown"

Makes tests very Flaky.
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20Chromium&testType=sync_integration_tests&tests=TwoClientPasswordsSyncTest.SetPassphraseAndThenSetupSync

Can reproduce on local build.


> sync: Gracefully handle very early shutdown
> 
> Introduce a new object to communicate cross-thread cancellation signals.
> This new object, the CancellationSignal, is protected by a lock.  It
> allows the receiving thread to query whether or not a stop has been
> requested.  It also allows the receiving thread to safely register a
> cross-thread callback to be invoked immediately when a stop is
> requested.
> 
> This class is used to reimplement the UI thread to sync thread early
> shutdown signal.  Previously, the UI thread would try to call in to
> objects owned by the sync thread.  This required a workaround if the
> signal arrived very early, since we couldn't guarantee the sync thread
> had actually created those objects until later.  The CancellationSignal
> is owned by the UI thread, so it is safe to call its RequestStop() at
> any point during sync initialization.  The sync thread will receive the
> signal when it's ready.
> 
> The new scheme has a few advantages over the old:
> - Thread ownership is simpler.  The SyncBackendHost::Core, SyncManager,
>   ServerConnectionManager, SyncScheduler and Syncer can now claim that
>   all their member functions run on the sync thread.
> - We no longer need to implement special case logic for when a shutdown
>   is requested before the SyncManager has initialized.
> - In a future CL, we can take advantage of the fact that we no longer
>   require the special case to reduce inter-thread communication during
>   sync startup.  This will make startup simpler and, in some cases,
>   improve sync startup time by as much as a few hundred milliseconds.
> - This will make it easier to address crbug.com/236451.
> 
> BUG=236451
> 
> Review URL: https://chromiumcodereview.appspot.com/23189021

TBR=rlarocque@chromium.org

Review URL: https://codereview.chromium.org/23658030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222205 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
index 0283065..03d6636 100644
--- a/sync/internal_api/sync_manager_impl.h
+++ b/sync/internal_api/sync_manager_impl.h
@@ -81,8 +81,7 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl :
       scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
       ReportUnrecoverableErrorFunction
           report_unrecoverable_error_function,
-      bool use_oauth2_token,
-      CancelationSignal* cancelation_signal) OVERRIDE;
+      bool use_oauth2_token) OVERRIDE;
   virtual void ThrowUnrecoverableError() OVERRIDE;
   virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
   virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
@@ -107,6 +106,7 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl :
   virtual void RemoveObserver(SyncManager::Observer* observer) OVERRIDE;
   virtual SyncStatus GetDetailedStatus() const OVERRIDE;
   virtual void SaveChanges() OVERRIDE;
+  virtual void StopSyncingForShutdown() OVERRIDE;
   virtual void ShutdownOnSyncThread() OVERRIDE;
   virtual UserShare* GetUserShare() OVERRIDE;
   virtual const std::string cache_guid() OVERRIDE;