Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

chrome/browser/ui/app_list/app_list_syncable_service.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 343 matching lines @@
     model_->SetItemName(oem_folder, oem_folder_name_);
 }
 
 AppListModel* AppListSyncableService::GetModel() {
   if (!apps_builder_)
     BuildModel();
 
   return model_.get();
 }
 
-void AppListSyncableService::AddItem(scoped_ptr<AppListItem> app_item) {
+void AppListSyncableService::AddItem(std::unique_ptr<AppListItem> app_item) {
   SyncItem* sync_item = FindOrAddSyncItem(app_item.get());
   if (!sync_item)
     return;  // Item is not valid.
 
   std::string folder_id;
   if (app_list::switches::IsFolderUIEnabled()) {
     if (AppIsOem(app_item->id())) {
       folder_id = FindOrCreateOemFolder();
       VLOG_IF(2, !folder_id.empty())
           << this << ": AddItem to OEM folder: " << sync_item->ToString();
@@ skipping 204 matching lines @@
     if (!ContainsKey(parent_ids, sync_item->item_id))
       DeleteSyncItem(sync_item);
   }
 }
 
 // AppListSyncableService syncer::SyncableService
 
 syncer::SyncMergeResult AppListSyncableService::MergeDataAndStartSyncing(
     syncer::ModelType type,
     const syncer::SyncDataList& initial_sync_data,
-    scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
-    scoped_ptr<syncer::SyncErrorFactory> error_handler) {
+    std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,
+    std::unique_ptr<syncer::SyncErrorFactory> error_handler) {
   DCHECK(!sync_processor_.get());
   DCHECK(sync_processor.get());
   DCHECK(error_handler.get());
 
   // Ensure the model is built.
   GetModel();
 
   sync_processor_ = std::move(sync_processor);
   sync_error_handler_ = std::move(error_handler);
   if (switches::IsFolderUIEnabled())
@@ skipping 322 matching lines @@
     if (IsDriveAppSyncId(item_id) && drive_app_provider_) {
       drive_app_provider_->RemoveUninstalledDriveAppFromSync(
           GetDriveAppIdFromSyncId(item_id));
     }
   }
 }
 
 std::string AppListSyncableService::FindOrCreateOemFolder() {
   AppListFolderItem* oem_folder = model_->FindFolderItem(kOemFolderId);
   if (!oem_folder) {
-    scoped_ptr<AppListFolderItem> new_folder(new AppListFolderItem(
+    std::unique_ptr<AppListFolderItem> new_folder(new AppListFolderItem(
         kOemFolderId, AppListFolderItem::FOLDER_TYPE_OEM));
     oem_folder =
         static_cast<AppListFolderItem*>(model_->AddItem(std::move(new_folder)));
     SyncItem* oem_sync_item = FindSyncItem(kOemFolderId);
     if (oem_sync_item) {
       VLOG(1) << "Creating OEM folder from existing sync item: "
                << oem_sync_item->item_ordinal.ToDebugString();
       model_->SetItemPosition(oem_folder, oem_sync_item->item_ordinal);
     } else {
       model_->SetItemPosition(oem_folder, GetOemFolderPos());
@@ skipping 64 matching lines @@
   } else {
     res += " { " + item_name + " }";
     res += " [" + item_ordinal.ToDebugString() + "]";
     if (!parent_id.empty())
       res += " <" + parent_id.substr(0, 8) + ">";
   }
   return res;
 }
 
 }  // namespace app_list