Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Unified Diff: ui/app_list/views/app_list_main_view_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/app_list_item_view.h ('k') | ui/app_list/views/app_list_menu_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_main_view_unittest.cc
diff --git a/ui/app_list/views/app_list_main_view_unittest.cc b/ui/app_list/views/app_list_main_view_unittest.cc
index 15d35443d0211d5dd4864b63d33a92970b4ccaf0..9bbe784f230562a674e5dd6897e05ffd2fe10cd8 100644
--- a/ui/app_list/views/app_list_main_view_unittest.cc
+++ b/ui/app_list/views/app_list_main_view_unittest.cc
@@ -4,8 +4,9 @@
#include "ui/app_list/views/app_list_main_view.h"
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
@@ -60,7 +61,7 @@ class GridViewVisibleWaiter {
}
AppsGridView* grid_view_;
- scoped_ptr<base::RunLoop> run_loop_;
+ std::unique_ptr<base::RunLoop> run_loop_;
base::RepeatingTimer check_timer_;
DISALLOW_COPY_AND_ASSIGN(GridViewVisibleWaiter);
@@ -243,7 +244,7 @@ class AppListMainViewTest : public views::ViewsTestBase {
protected:
views::Widget* main_widget_; // Owned by native window.
AppListMainView* main_view_; // Owned by |main_widget_|.
- scoped_ptr<AppListTestViewDelegate> delegate_;
+ std::unique_ptr<AppListTestViewDelegate> delegate_;
views::Widget* search_box_widget_; // Owned by |main_widget_|.
SearchBoxView* search_box_view_; // Owned by |search_box_widget_|.
@@ -260,7 +261,7 @@ TEST_F(AppListMainViewTest, ModelChanged) {
// The model is owned by a profile keyed service, which is never destroyed
// until after profile switching.
- scoped_ptr<AppListModel> old_model(delegate_->ReleaseTestModel());
+ std::unique_ptr<AppListModel> old_model(delegate_->ReleaseTestModel());
const int kReplacementItems = 5;
delegate_->ReplaceTestModel(kReplacementItems);
« no previous file with comments | « ui/app_list/views/app_list_item_view.h ('k') | ui/app_list/views/app_list_menu_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698