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

Unified Diff: ui/app_list/views/app_list_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_view.cc ('k') | ui/app_list/views/apps_grid_view.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_view_unittest.cc
diff --git a/ui/app_list/views/app_list_view_unittest.cc b/ui/app_list/views/app_list_view_unittest.cc
index b2631379a7c6a4eaa47666b9ba8da8b0908901d4..6549f2e48ac77d24efb04f99df3a2667c92fd492 100644
--- a/ui/app_list/views/app_list_view_unittest.cc
+++ b/ui/app_list/views/app_list_view_unittest.cc
@@ -11,6 +11,7 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -158,9 +159,9 @@ class AppListViewTestContext {
PaginationModel* GetPaginationModel();
const TestType test_type_;
- scoped_ptr<base::RunLoop> run_loop_;
+ std::unique_ptr<base::RunLoop> run_loop_;
app_list::AppListView* view_; // Owned by native widget.
- scoped_ptr<app_list::test::AppListTestViewDelegate> delegate_;
+ std::unique_ptr<app_list::test::AppListTestViewDelegate> delegate_;
DISALLOW_COPY_AND_ASSIGN(AppListViewTestContext);
};
@@ -555,7 +556,7 @@ void AppListViewTestContext::RunProfileChangeTest() {
// Change the profile. The original model needs to be kept alive for
// observers to unregister themselves.
- scoped_ptr<AppListTestModel> original_test_model(
+ std::unique_ptr<AppListTestModel> original_test_model(
delegate_->ReleaseTestModel());
delegate_->set_next_profile_app_count(1);
@@ -702,7 +703,7 @@ class AppListViewTestAura : public views::ViewsTestBase,
}
protected:
- scoped_ptr<AppListViewTestContext> test_context_;
+ std::unique_ptr<AppListViewTestContext> test_context_;
private:
DISALLOW_COPY_AND_ASSIGN(AppListViewTestAura);
@@ -716,7 +717,8 @@ class AppListViewTestDesktop : public views::ViewsTestBase,
// testing::Test overrides:
void SetUp() override {
- set_views_delegate(make_scoped_ptr(new AppListViewTestViewsDelegate(this)));
+ set_views_delegate(
+ base::WrapUnique(new AppListViewTestViewsDelegate(this)));
views::ViewsTestBase::SetUp();
test_context_.reset(new AppListViewTestContext(GetParam(), NULL));
}
@@ -727,7 +729,7 @@ class AppListViewTestDesktop : public views::ViewsTestBase,
}
protected:
- scoped_ptr<AppListViewTestContext> test_context_;
+ std::unique_ptr<AppListViewTestContext> test_context_;
private:
class AppListViewTestViewsDelegate : public views::TestViewsDelegate {
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/app_list/views/apps_grid_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698