| Index: chrome/browser/sync/glue/sync_backend_host_impl.cc
|
| diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc
|
| index b5db3d09c35294195b0826f73bcc8c73fe100c92..598c0e16ea65c83af824c074ec1cc7425ac1592c 100644
|
| --- a/chrome/browser/sync/glue/sync_backend_host_impl.cc
|
| +++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc
|
| @@ -105,7 +105,8 @@ void SyncBackendHostImpl::Initialize(
|
| const syncer::SyncCredentials& credentials,
|
| bool delete_sync_data_folder,
|
| scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory,
|
| - scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler,
|
| + const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
|
| + unrecoverable_error_handler,
|
| const base::Closure& report_unrecoverable_error_function,
|
| syncer::NetworkResources* network_resources,
|
| scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state) {
|
| @@ -159,7 +160,7 @@ void SyncBackendHostImpl::Initialize(
|
| scoped_ptr<InternalComponentsFactory>(
|
| new syncer::InternalComponentsFactoryImpl(factory_switches))
|
| .Pass(),
|
| - unrecoverable_error_handler.Pass(), report_unrecoverable_error_function,
|
| + unrecoverable_error_handler, report_unrecoverable_error_function,
|
| saved_nigori_state.Pass(), clear_data_option, invalidation_versions));
|
| InitCore(init_opts.Pass());
|
| }
|
|
|