Replace scoped_ptr with std::unique_ptr in //ui

ui/app_list/app_list_model.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_APP_LIST_APP_LIST_MODEL_H_
 #define UI_APP_LIST_APP_LIST_MODEL_H_
 
 #include <stddef.h>
 
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/app_list/app_list_export.h"
 #include "ui/app_list/app_list_item_list.h"
 #include "ui/app_list/app_list_item_list_observer.h"
 #include "ui/app_list/search_result.h"
 #include "ui/base/models/list_model.h"
 
 namespace app_list {
 
 class AppListFolderItem;
@@ skipping 42 matching lines @@
   State state() { return state_; }
 
   // Finds the item matching |id|.
   AppListItem* FindItem(const std::string& id);
 
   // Find a folder item matching |id|.
   AppListFolderItem* FindFolderItem(const std::string& id);
 
   // Adds |item| to the model. The model takes ownership of |item|. Returns a
   // pointer to the item that is safe to use (e.g. after passing ownership).
-  AppListItem* AddItem(scoped_ptr<AppListItem> item);
+  AppListItem* AddItem(std::unique_ptr<AppListItem> item);
 
   // Adds |item| to an existing folder or creates a new folder. If |folder_id|
   // is empty, adds the item to the top level model instead. The model takes
   // ownership of |item|. Returns a pointer to the item that is safe to use.
-  AppListItem* AddItemToFolder(scoped_ptr<AppListItem> item,
+  AppListItem* AddItemToFolder(std::unique_ptr<AppListItem> item,
                                const std::string& folder_id);
 
   // Merges two items. If the target item is a folder, the source item is added
   // to the end of the target folder. Otherwise a new folder is created in the
   // same position as the target item with the target item as the first item in
   // the new folder and the source item as the second item. Returns the id of
   // the target folder, or an empty string if the merge failed. The source item
   // may already be in a folder. See also the comment for RemoveItemFromFolder.
   // NOTE: This should only be called by the View code (not the sync code); it
   // enforces folder restrictions (e.g. the target can not be an OEM folder).
@@ skipping 94 matching lines @@
   // AppListItemListObserver
   void OnListItemMoved(size_t from_index,
                        size_t to_index,
                        AppListItem* item) override;
 
   // Returns an existing folder matching |folder_id| or creates a new folder.
   AppListFolderItem* FindOrCreateFolderItem(const std::string& folder_id);
 
   // Adds |item_ptr| to |top_level_item_list_| and notifies observers.
   AppListItem* AddItemToItemListAndNotify(
-      scoped_ptr<AppListItem> item_ptr);
+      std::unique_ptr<AppListItem> item_ptr);
 
   // Adds |item_ptr| to |top_level_item_list_| and notifies observers that an
   // Update occured (e.g. item moved from a folder).
   AppListItem* AddItemToItemListAndNotifyUpdate(
-      scoped_ptr<AppListItem> item_ptr);
+      std::unique_ptr<AppListItem> item_ptr);
 
   // Adds |item_ptr| to |folder| and notifies observers.
-  AppListItem* AddItemToFolderItemAndNotify(AppListFolderItem* folder,
-                                            scoped_ptr<AppListItem> item_ptr);
+  AppListItem* AddItemToFolderItemAndNotify(
+      AppListFolderItem* folder,
+      std::unique_ptr<AppListItem> item_ptr);
 
   // Removes |item| from |top_level_item_list_| or calls RemoveItemFromFolder if
   // |item|->folder_id is set.
-  scoped_ptr<AppListItem> RemoveItem(AppListItem* item);
+  std::unique_ptr<AppListItem> RemoveItem(AppListItem* item);
 
   // Removes |item| from |folder|. If |folder| becomes empty, deletes |folder|
   // from |top_level_item_list_|. Does NOT trigger observers, calling function
   // must do so.
-  scoped_ptr<AppListItem> RemoveItemFromFolder(AppListFolderItem* folder,
-                                               AppListItem* item);
+  std::unique_ptr<AppListItem> RemoveItemFromFolder(AppListFolderItem* folder,
+                                                    AppListItem* item);
 
-  scoped_ptr<AppListItemList> top_level_item_list_;
+  std::unique_ptr<AppListItemList> top_level_item_list_;
 
-  scoped_ptr<SearchBoxModel> search_box_;
-  scoped_ptr<SearchResults> results_;
+  std::unique_ptr<SearchBoxModel> search_box_;
+  std::unique_ptr<SearchResults> results_;
 
   Status status_;
   State state_;
   base::ObserverList<AppListModelObserver, true> observers_;
   bool folders_enabled_;
   bool custom_launcher_page_enabled_;
   std::string custom_launcher_page_name_;
   bool search_engine_is_google_;
 
   // The current number of subpages the custom launcher page has pushed.
   int custom_launcher_page_subpage_depth_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListModel);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_APP_LIST_MODEL_H_