| Index: components/sync_driver/glue/sync_backend_host_core.cc
|
| diff --git a/components/sync_driver/glue/sync_backend_host_core.cc b/components/sync_driver/glue/sync_backend_host_core.cc
|
| index 0df0e3062d1e86c148300af0437a4a5336a61d6d..b5eb2d2d9a2caec61ca6169be43ab4db225cf0c4 100644
|
| --- a/components/sync_driver/glue/sync_backend_host_core.cc
|
| +++ b/components/sync_driver/glue/sync_backend_host_core.cc
|
| @@ -77,18 +77,20 @@ DoInitializeOptions::DoInitializeOptions(
|
| const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
|
| const GURL& service_url,
|
| const std::string& sync_user_agent,
|
| - scoped_ptr<syncer::HttpPostProviderFactory> http_bridge_factory,
|
| + std::unique_ptr<syncer::HttpPostProviderFactory> http_bridge_factory,
|
| const syncer::SyncCredentials& credentials,
|
| const std::string& invalidator_client_id,
|
| - scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory,
|
| + std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory,
|
| bool delete_sync_data_folder,
|
| const std::string& restored_key_for_bootstrapping,
|
| const std::string& restored_keystore_key_for_bootstrapping,
|
| - scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory,
|
| + std::unique_ptr<syncer::InternalComponentsFactory>
|
| + internal_components_factory,
|
| const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
|
| unrecoverable_error_handler,
|
| const base::Closure& report_unrecoverable_error_function,
|
| - scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state,
|
| + std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>
|
| + saved_nigori_state,
|
| syncer::PassphraseTransitionClearDataOption clear_data_option,
|
| const std::map<syncer::ModelType, int64_t>& invalidation_versions)
|
| : sync_loop(sync_loop),
|
| @@ -382,7 +384,7 @@ void SyncBackendHostCore::OnProtocolEvent(
|
| const syncer::ProtocolEvent& event) {
|
| // TODO(rlarocque): Find a way to pass event_clone as a scoped_ptr.
|
| if (forward_protocol_events_) {
|
| - scoped_ptr<syncer::ProtocolEvent> event_clone(event.Clone());
|
| + std::unique_ptr<syncer::ProtocolEvent> event_clone(event.Clone());
|
| host_.Call(
|
| FROM_HERE,
|
| &SyncBackendHostImpl::HandleProtocolEventOnFrontendLoop,
|
| @@ -420,7 +422,7 @@ void SyncBackendHostCore::DoOnIncomingInvalidation(
|
| << last_invalidation->second;
|
| continue;
|
| }
|
| - scoped_ptr<syncer::InvalidationInterface> inv_adapter(
|
| + std::unique_ptr<syncer::InvalidationInterface> inv_adapter(
|
| new InvalidationAdapter(invalidation));
|
| sync_manager_->OnIncomingInvalidation(type, std::move(inv_adapter));
|
| if (!invalidation.is_unknown_version())
|
| @@ -436,7 +438,7 @@ void SyncBackendHostCore::DoOnIncomingInvalidation(
|
| }
|
|
|
| void SyncBackendHostCore::DoInitialize(
|
| - scoped_ptr<DoInitializeOptions> options) {
|
| + std::unique_ptr<DoInitializeOptions> options) {
|
| DCHECK(!sync_loop_);
|
| sync_loop_ = options->sync_loop;
|
| DCHECK(sync_loop_);
|
|
|