Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(683)

Unified Diff: chrome/browser/sync/glue/sync_backend_host_core.cc

Issue 1275743002: [Sync] Remove backend unrecoverable error handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix leak Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/sync_backend_host_core.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.cc b/chrome/browser/sync/glue/sync_backend_host_core.cc
index 12bafbb8aad2df7545261918c8cf776c9092750b..d08e1a5fea4ece17e7715533ffbdf292a2dcfe48 100644
--- a/chrome/browser/sync/glue/sync_backend_host_core.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_core.cc
@@ -69,7 +69,8 @@ DoInitializeOptions::DoInitializeOptions(
const std::string& restored_key_for_bootstrapping,
const std::string& restored_keystore_key_for_bootstrapping,
scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory,
- scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler,
+ const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
+ unrecoverable_error_handler,
const base::Closure& report_unrecoverable_error_function,
scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state,
syncer::PassphraseTransitionClearDataOption clear_data_option,
@@ -90,7 +91,7 @@ DoInitializeOptions::DoInitializeOptions(
restored_keystore_key_for_bootstrapping(
restored_keystore_key_for_bootstrapping),
internal_components_factory(internal_components_factory.Pass()),
- unrecoverable_error_handler(unrecoverable_error_handler.Pass()),
+ unrecoverable_error_handler(unrecoverable_error_handler),
report_unrecoverable_error_function(report_unrecoverable_error_function),
saved_nigori_state(saved_nigori_state.Pass()),
clear_data_option(clear_data_option),
@@ -463,8 +464,7 @@ void SyncBackendHostCore::DoInitialize(
args.internal_components_factory =
options->internal_components_factory.Pass();
args.encryptor = &encryptor_;
- args.unrecoverable_error_handler =
- options->unrecoverable_error_handler.Pass();
+ args.unrecoverable_error_handler = options->unrecoverable_error_handler;
args.report_unrecoverable_error_function =
options->report_unrecoverable_error_function;
args.cancelation_signal = &stop_syncing_signal_;
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host_core.h ('k') | chrome/browser/sync/glue/sync_backend_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698