| Index: components/browser_sync/browser/profile_sync_components_factory_impl.cc
|
| diff --git a/components/browser_sync/browser/profile_sync_components_factory_impl.cc b/components/browser_sync/browser/profile_sync_components_factory_impl.cc
|
| index 370c93e237b7021c12ec9009b4bfe24446660bf7..7ca34054115bb937bd015475620cad86219e8e18 100644
|
| --- a/components/browser_sync/browser/profile_sync_components_factory_impl.cc
|
| +++ b/components/browser_sync/browser/profile_sync_components_factory_impl.cc
|
| @@ -7,6 +7,7 @@
|
| #include <utility>
|
|
|
| #include "base/command_line.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "build/build_config.h"
|
| #include "components/autofill/core/browser/autofill_wallet_data_type_controller.h"
|
| @@ -278,9 +279,9 @@ ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost(
|
| name, sync_client_, ui_thread_, invalidator, sync_prefs, sync_folder);
|
| }
|
|
|
| -scoped_ptr<sync_driver::LocalDeviceInfoProvider>
|
| +std::unique_ptr<sync_driver::LocalDeviceInfoProvider>
|
| ProfileSyncComponentsFactoryImpl::CreateLocalDeviceInfoProvider() {
|
| - return scoped_ptr<sync_driver::LocalDeviceInfoProvider>(
|
| + return base::WrapUnique(
|
| new browser_sync::LocalDeviceInfoProviderImpl(channel_, version_,
|
| is_tablet_));
|
| }
|
| @@ -320,15 +321,15 @@ OAuth2TokenService* TokenServiceProvider::GetTokenService() {
|
| return token_service_;
|
| }
|
|
|
| -scoped_ptr<syncer::AttachmentService>
|
| +std::unique_ptr<syncer::AttachmentService>
|
| ProfileSyncComponentsFactoryImpl::CreateAttachmentService(
|
| - scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
|
| + std::unique_ptr<syncer::AttachmentStoreForSync> attachment_store,
|
| const syncer::UserShare& user_share,
|
| const std::string& store_birthday,
|
| syncer::ModelType model_type,
|
| syncer::AttachmentService::Delegate* delegate) {
|
| - scoped_ptr<syncer::AttachmentUploader> attachment_uploader;
|
| - scoped_ptr<syncer::AttachmentDownloader> attachment_downloader;
|
| + std::unique_ptr<syncer::AttachmentUploader> attachment_uploader;
|
| + std::unique_ptr<syncer::AttachmentDownloader> attachment_downloader;
|
| // Only construct an AttachmentUploader and AttachmentDownload if we have sync
|
| // credentials. We may not have sync credentials because there may not be a
|
| // signed in sync user.
|
| @@ -362,7 +363,7 @@ ProfileSyncComponentsFactoryImpl::CreateAttachmentService(
|
| const base::TimeDelta initial_backoff_delay =
|
| base::TimeDelta::FromMinutes(30);
|
| const base::TimeDelta max_backoff_delay = base::TimeDelta::FromHours(4);
|
| - scoped_ptr<syncer::AttachmentService> attachment_service(
|
| + std::unique_ptr<syncer::AttachmentService> attachment_service(
|
| new syncer::AttachmentServiceImpl(
|
| std::move(attachment_store), std::move(attachment_uploader),
|
| std::move(attachment_downloader), delegate, initial_backoff_delay,
|
|
|