| Index: sync/tools/sync_client.cc
|
| diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
|
| index e38254654ad3864677fd44532980a4486fb733fe..63f5365c2208837423a52da84341ec50795a60aa 100644
|
| --- a/sync/tools/sync_client.cc
|
| +++ b/sync/tools/sync_client.cc
|
| @@ -27,6 +27,7 @@
|
| #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/cancellation_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,6 +351,7 @@ int SyncClientMain(int argc, char* argv[]) {
|
| InternalComponentsFactory::ENCRYPTION_KEYSTORE,
|
| InternalComponentsFactory::BACKOFF_NORMAL
|
| };
|
| + CancellationSignal cancellation_signal;
|
|
|
| sync_manager->Init(database_dir.path(),
|
| WeakHandle<JsEventHandler>(
|
| @@ -369,7 +371,8 @@ int SyncClientMain(int argc, char* argv[]) {
|
| &null_encryptor,
|
| scoped_ptr<UnrecoverableErrorHandler>(
|
| new LoggingUnrecoverableErrorHandler).Pass(),
|
| - &LogUnrecoverableErrorContext, false);
|
| + &LogUnrecoverableErrorContext, false,
|
| + &cancellation_signal);
|
| // TODO(akalin): Avoid passing in model parameters multiple times by
|
| // organizing handling of model types.
|
| invalidator->UpdateCredentials(credentials.email, credentials.sync_token);
|
|
|