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

Unified Diff: ui/views/accessible_pane_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/views/accessible_pane_view.h ('k') | ui/views/animation/bounds_animator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/accessible_pane_view_unittest.cc
diff --git a/ui/views/accessible_pane_view_unittest.cc b/ui/views/accessible_pane_view_unittest.cc
index 864481ff3ffcacc9a6cff0d49cf3274b3b00ab5e..d3f5bd0d44b7ada293e6327a9724ce5d3635d10e 100644
--- a/ui/views/accessible_pane_view_unittest.cc
+++ b/ui/views/accessible_pane_view_unittest.cc
@@ -38,10 +38,10 @@ class TestBarView : public AccessiblePaneView,
private:
void Init();
- scoped_ptr<LabelButton> child_button_;
- scoped_ptr<LabelButton> second_child_button_;
- scoped_ptr<LabelButton> third_child_button_;
- scoped_ptr<LabelButton> not_child_button_;
+ std::unique_ptr<LabelButton> child_button_;
+ std::unique_ptr<LabelButton> second_child_button_;
+ std::unique_ptr<LabelButton> third_child_button_;
+ std::unique_ptr<LabelButton> not_child_button_;
DISALLOW_COPY_AND_ASSIGN(TestBarView);
};
@@ -74,7 +74,7 @@ View* TestBarView::GetDefaultFocusableChild() {
TEST_F(AccessiblePaneViewTest, SimpleSetPaneFocus) {
TestBarView* test_view = new TestBarView();
- scoped_ptr<Widget> widget(new Widget());
+ std::unique_ptr<Widget> widget(new Widget());
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(50, 50, 650, 650);
@@ -102,7 +102,7 @@ TEST_F(AccessiblePaneViewTest, SimpleSetPaneFocus) {
TEST_F(AccessiblePaneViewTest, SetPaneFocusAndRestore) {
View* test_view_main = new View();
- scoped_ptr<Widget> widget_main(new Widget());
+ std::unique_ptr<Widget> widget_main(new Widget());
Widget::InitParams params_main = CreateParams(Widget::InitParams::TYPE_POPUP);
params_main.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
// By default, TYPE_POPUP is not activatable.
@@ -117,7 +117,7 @@ TEST_F(AccessiblePaneViewTest, SetPaneFocusAndRestore) {
EXPECT_TRUE(test_view_main->HasFocus());
TestBarView* test_view_bar = new TestBarView();
- scoped_ptr<Widget> widget_bar(new Widget());
+ std::unique_ptr<Widget> widget_bar(new Widget());
Widget::InitParams params_bar = CreateParams(Widget::InitParams::TYPE_POPUP);
params_bar.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params_bar.activatable = Widget::InitParams::ACTIVATABLE_YES;
@@ -157,7 +157,7 @@ TEST_F(AccessiblePaneViewTest, SetPaneFocusAndRestore) {
TEST_F(AccessiblePaneViewTest, TwoSetPaneFocus) {
TestBarView* test_view = new TestBarView();
TestBarView* test_view_2 = new TestBarView();
- scoped_ptr<Widget> widget(new Widget());
+ std::unique_ptr<Widget> widget(new Widget());
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(50, 50, 650, 650);
@@ -187,7 +187,7 @@ TEST_F(AccessiblePaneViewTest, TwoSetPaneFocus) {
TEST_F(AccessiblePaneViewTest, PaneFocusTraversal) {
TestBarView* test_view = new TestBarView();
TestBarView* original_test_view = new TestBarView();
- scoped_ptr<Widget> widget(new Widget());
+ std::unique_ptr<Widget> widget(new Widget());
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(50, 50, 650, 650);
« no previous file with comments | « ui/views/accessible_pane_view.h ('k') | ui/views/animation/bounds_animator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698