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, 1 insertions, 4 deletions

diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index 6526516..b677531 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -27,7 +27,6 @@
 #include "net/dns/host_resolver.h"
 #include "net/http/transport_security_state.h"
 #include "net/url_request/url_request_test_util.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/engine/passive_model_worker.h"
@@ -350,7 +349,6 @@ int SyncClientMain(int argc, char* argv[]) {
       InternalComponentsFactory::ENCRYPTION_KEYSTORE,
       InternalComponentsFactory::BACKOFF_NORMAL
   };
-  CancelationSignal cancelation_signal;
 
   sync_manager->Init(database_dir.path(),
                     WeakHandle<JsEventHandler>(
@@ -370,8 +368,7 @@ int SyncClientMain(int argc, char* argv[]) {
                     &null_encryptor,
                     scoped_ptr<UnrecoverableErrorHandler>(
                         new LoggingUnrecoverableErrorHandler).Pass(),
-                    &LogUnrecoverableErrorContext, false,
-                    &cancelation_signal);
+                    &LogUnrecoverableErrorContext, false);
   // TODO(akalin): Avoid passing in model parameters multiple times by
   // organizing handling of model types.
   invalidator->UpdateCredentials(credentials.email, credentials.sync_token);