Index: chrome/browser/ui/app_list/app_list_syncable_service.h |
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.h b/chrome/browser/ui/app_list/app_list_syncable_service.h |
index 0fc6f73ac37a21af01dc7e09fa16e2c36ccec09e..5b25ef88311263c26cf0068a893aec9ddfa50d82 100644 |
--- a/chrome/browser/ui/app_list/app_list_syncable_service.h |
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.h |
@@ -8,9 +8,9 @@ |
#include <stddef.h> |
#include <map> |
+#include <memory> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "build/build_config.h" |
#include "chrome/browser/apps/drive/drive_app_uninstall_sync_service.h" |
#include "chrome/browser/sync/glue/sync_start_util.h" |
@@ -71,7 +71,7 @@ class AppListSyncableService : public syncer::SyncableService, |
// Adds |item| to |sync_items_| and |model_|. If a sync item already exists, |
// updates the existing sync item instead. |
- void AddItem(scoped_ptr<AppListItem> app_item); |
+ void AddItem(std::unique_ptr<AppListItem> app_item); |
// Removes sync item matching |id|. |
void RemoveItem(const std::string& id); |
@@ -102,8 +102,8 @@ class AppListSyncableService : public syncer::SyncableService, |
syncer::SyncMergeResult MergeDataAndStartSyncing( |
syncer::ModelType type, |
const syncer::SyncDataList& initial_sync_data, |
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor, |
- scoped_ptr<syncer::SyncErrorFactory> error_handler) override; |
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor, |
+ std::unique_ptr<syncer::SyncErrorFactory> error_handler) override; |
void StopSyncing(syncer::ModelType type) override; |
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override; |
syncer::SyncError ProcessSyncChanges( |
@@ -204,15 +204,15 @@ class AppListSyncableService : public syncer::SyncableService, |
Profile* profile_; |
extensions::ExtensionSystem* extension_system_; |
- scoped_ptr<AppListModel> model_; |
- scoped_ptr<ModelObserver> model_observer_; |
- scoped_ptr<ModelPrefUpdater> model_pref_updater_; |
- scoped_ptr<ExtensionAppModelBuilder> apps_builder_; |
+ std::unique_ptr<AppListModel> model_; |
+ std::unique_ptr<ModelObserver> model_observer_; |
+ std::unique_ptr<ModelPrefUpdater> model_pref_updater_; |
+ std::unique_ptr<ExtensionAppModelBuilder> apps_builder_; |
#if defined(OS_CHROMEOS) |
- scoped_ptr<ArcAppModelBuilder> arc_apps_builder_; |
+ std::unique_ptr<ArcAppModelBuilder> arc_apps_builder_; |
#endif |
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; |
- scoped_ptr<syncer::SyncErrorFactory> sync_error_handler_; |
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor_; |
+ std::unique_ptr<syncer::SyncErrorFactory> sync_error_handler_; |
SyncItemMap sync_items_; |
syncer::SyncableService::StartSyncFlare flare_; |
bool initial_sync_data_processed_; |
@@ -220,7 +220,7 @@ class AppListSyncableService : public syncer::SyncableService, |
std::string oem_folder_name_; |
// Provides integration with Drive apps. |
- scoped_ptr<DriveAppProvider> drive_app_provider_; |
+ std::unique_ptr<DriveAppProvider> drive_app_provider_; |
DISALLOW_COPY_AND_ASSIGN(AppListSyncableService); |
}; |