diff options
| author | zea <zea@chromium.org> | 2015-06-09 10:44:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 17:45:21 +0000 |
| commit | 56e4017ed796289d9d5fe6d7ac72b5eccd19c299 (patch) | |
| tree | 51e69ebea24b88f8c61c6e68c8591c69a675318e /sync/tools | |
| parent | dcbfdd3e1289eb4f0b38fde85e654341c19e72e5 (diff) | |
| download | chromium_src-56e4017ed796289d9d5fe6d7ac72b5eccd19c299.zip chromium_src-56e4017ed796289d9d5fe6d7ac72b5eccd19c299.tar.gz chromium_src-56e4017ed796289d9d5fe6d7ac72b5eccd19c299.tar.bz2 | |
[Sync] Replace ReportUnrecoverableErrorFunction with base::Closure
Fixes a bug where the raw pointer wasn't being default initialized in all
cases (SyncManager::InitArgs in particular), and ensure that kind of bug
doesn't happen again.
BUG=123223
Review URL: https://codereview.chromium.org/1167183002
Cr-Commit-Position: refs/heads/master@{#333520}
Diffstat (limited to 'sync/tools')
| -rw-r--r-- | sync/tools/sync_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index 99a2a48..a433fa9 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -38,7 +38,6 @@ #include "sync/internal_api/public/read_node.h" #include "sync/internal_api/public/sync_manager.h" #include "sync/internal_api/public/sync_manager_factory.h" -#include "sync/internal_api/public/util/report_unrecoverable_error_function.h" #include "sync/internal_api/public/util/unrecoverable_error_handler.h" #include "sync/internal_api/public/util/weak_handle.h" #include "sync/js/js_event_details.h" @@ -437,7 +436,8 @@ int SyncClientMain(int argc, char* argv[]) { new InternalComponentsFactoryImpl(factory_switches)); args.encryptor = &null_encryptor; args.unrecoverable_error_handler.reset(new LoggingUnrecoverableErrorHandler); - args.report_unrecoverable_error_function = &LogUnrecoverableErrorContext; + args.report_unrecoverable_error_function = + base::Bind(LogUnrecoverableErrorContext); args.cancelation_signal = &scm_cancelation_signal; sync_manager->Init(&args); // TODO(akalin): Avoid passing in model parameters multiple times by |