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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/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/view_targeter_unittest.cc ('k') | ui/views/view_unittest_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view_unittest.cc
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 4b50b319ad2556c1533674235ada984e97361550..797d147baee34f291f121a28c21eb40d63e07c41 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -2,13 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/views/view.h"
+
#include <stddef.h>
#include <map>
+#include <memory>
#include "base/i18n/rtl.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/rand_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -39,7 +41,6 @@
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/focus/view_storage.h"
#include "ui/views/test/views_test_base.h"
-#include "ui/views/view.h"
#include "ui/views/widget/native_widget.h"
#include "ui/views/widget/root_view.h"
#include "ui/views/window/dialog_client_view.h"
@@ -385,7 +386,7 @@ TEST_F(ViewTest, MouseEvent) {
TestView* v2 = new TestView();
v2->SetBoundsRect(gfx::Rect(100, 100, 100, 100));
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(50, 50, 650, 650);
@@ -448,7 +449,7 @@ TEST_F(ViewTest, DeleteOnPressed) {
v1->Reset();
v2->Reset();
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(50, 50, 650, 650);
@@ -2113,7 +2114,7 @@ TEST_F(ViewTest, HandleAccelerator) {
EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
// Create a window and add the view as its child.
- 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(0, 0, 100, 100);
@@ -2192,7 +2193,7 @@ TEST_F(ViewTest, ActivateAccelerator) {
EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
// Create a window and add the view as its child.
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(0, 0, 100, 100);
@@ -2255,7 +2256,7 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) {
view->AddAccelerator(return_accelerator);
EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(0, 0, 100, 100);
@@ -2283,7 +2284,7 @@ TEST_F(ViewTest, ViewInHiddenWidgetWithAccelerator) {
view->AddAccelerator(return_accelerator);
EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(0, 0, 100, 100);
@@ -2429,13 +2430,13 @@ class ToplevelWidgetObserverView : public View {
// Test that a view can track the current top level widget by overriding
// View::ViewHierarchyChanged() and View::NativeViewHierarchyChanged().
TEST_F(ViewTest, MAYBE_NativeViewHierarchyChanged) {
- scoped_ptr<Widget> toplevel1(new Widget);
+ std::unique_ptr<Widget> toplevel1(new Widget);
Widget::InitParams toplevel1_params =
CreateParams(Widget::InitParams::TYPE_POPUP);
toplevel1_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
toplevel1->Init(toplevel1_params);
- scoped_ptr<Widget> toplevel2(new Widget);
+ std::unique_ptr<Widget> toplevel2(new Widget);
Widget::InitParams toplevel2_params =
CreateParams(Widget::InitParams::TYPE_POPUP);
toplevel2_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ -2676,7 +2677,7 @@ TEST_F(ViewTest, TransformEvent) {
TEST_F(ViewTest, TransformVisibleBound) {
gfx::Rect viewport_bounds(0, 0, 100, 100);
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = viewport_bounds;
@@ -2733,7 +2734,7 @@ class VisibleBoundsView : public View {
TEST_F(ViewTest, OnVisibleBoundsChanged) {
gfx::Rect viewport_bounds(0, 0, 100, 100);
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = viewport_bounds;
@@ -2835,7 +2836,7 @@ TEST_F(ViewTest, AddAndRemoveSchedulePaints) {
// We have to put the View hierarchy into a Widget or no paints will be
// scheduled.
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = viewport_bounds;
@@ -2855,7 +2856,7 @@ TEST_F(ViewTest, AddAndRemoveSchedulePaints) {
parent_view->scheduled_paint_rects_.clear();
parent_view->RemoveChildView(child_view);
- scoped_ptr<View> child_deleter(child_view);
+ std::unique_ptr<View> child_deleter(child_view);
ASSERT_EQ(1U, parent_view->scheduled_paint_rects_.size());
EXPECT_EQ(child_view->bounds(), parent_view->scheduled_paint_rects_.front());
@@ -3051,7 +3052,7 @@ TEST_F(ViewTest, ConversionsWithTransform) {
// Tests conversion methods to and from screen coordinates.
TEST_F(ViewTest, ConversionsToFromScreen) {
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(50, 50, 650, 650);
@@ -3077,7 +3078,7 @@ TEST_F(ViewTest, ConversionsToFromScreen) {
// Tests conversion methods for rectangles.
TEST_F(ViewTest, ConvertRectWithTransform) {
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(50, 50, 650, 650);
@@ -3192,7 +3193,7 @@ TEST_F(ViewTest, ViewHierarchyChanged) {
ObserverView* v3 = new ObserverView();
// Add |v3| to |v2|.
- scoped_ptr<ObserverView> v2(new ObserverView());
+ std::unique_ptr<ObserverView> v2(new ObserverView());
v2->AddChildView(v3);
// Make sure both |v2| and |v3| receive the ViewHierarchyChanged()
@@ -4207,15 +4208,15 @@ TEST_F(ViewLayerTest, ReorderUnderWidget) {
TEST_F(ViewLayerTest, AcquireLayer) {
View* content = new View;
widget()->SetContentsView(content);
- scoped_ptr<View> c1(new View);
+ std::unique_ptr<View> c1(new View);
c1->SetPaintToLayer(true);
EXPECT_TRUE(c1->layer());
content->AddChildView(c1.get());
- scoped_ptr<ui::Layer> layer(c1->AcquireLayer());
+ std::unique_ptr<ui::Layer> layer(c1->AcquireLayer());
EXPECT_EQ(layer.get(), c1->layer());
- scoped_ptr<ui::Layer> layer2(c1->RecreateLayer());
+ std::unique_ptr<ui::Layer> layer2(c1->RecreateLayer());
EXPECT_NE(c1->layer(), layer2.get());
// Destroy view before destroying layer.
@@ -4224,7 +4225,7 @@ TEST_F(ViewLayerTest, AcquireLayer) {
// Verify the z-order of the layers as a result of calling RecreateLayer().
TEST_F(ViewLayerTest, RecreateLayerZOrder) {
- scoped_ptr<View> v(new View());
+ std::unique_ptr<View> v(new View());
v->SetPaintToLayer(true);
View* v1 = new View();
@@ -4240,7 +4241,7 @@ TEST_F(ViewLayerTest, RecreateLayerZOrder) {
EXPECT_EQ(v1->layer(), child_layers_pre[0]);
EXPECT_EQ(v2->layer(), child_layers_pre[1]);
- scoped_ptr<ui::Layer> v1_old_layer(v1->RecreateLayer());
+ std::unique_ptr<ui::Layer> v1_old_layer(v1->RecreateLayer());
// Test the new layer order. We expect: |v1| |v1_old_layer| |v2|.
// for |v1| and |v2|.
@@ -4272,7 +4273,7 @@ TEST_F(ViewLayerTest, RecreateLayerZOrderWidgetParent) {
EXPECT_EQ(v1->layer(), child_layers_pre[0]);
EXPECT_EQ(v2->layer(), child_layers_pre[1]);
- scoped_ptr<ui::Layer> v1_old_layer(v1->RecreateLayer());
+ std::unique_ptr<ui::Layer> v1_old_layer(v1->RecreateLayer());
// Test the new layer order. We expect: |v1| |v1_old_layer| |v2|.
const std::vector<ui::Layer*>& child_layers_post = root_layer->children();
@@ -4298,7 +4299,7 @@ TEST_F(ViewLayerTest, RecreateLayerMovesNonViewChildren) {
v.layer()->Add(&layer);
v.layer()->StackAtBottom(&layer);
- scoped_ptr<ui::Layer> old_layer(v.RecreateLayer());
+ std::unique_ptr<ui::Layer> old_layer(v.RecreateLayer());
// All children should be moved from old layer to new layer.
ASSERT_TRUE(old_layer.get() != NULL);
@@ -4404,7 +4405,7 @@ TEST_F(ViewTest, OnNativeThemeChanged) {
// new native theme notification.
test_view->AddChildView(test_view_child);
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
widget->Init(params);
@@ -4444,7 +4445,7 @@ TEST_F(ViewTest, ScopedTargetHandlerReceivesEvents) {
TestView* v = new TestView();
v->SetBoundsRect(gfx::Rect(0, 0, 300, 300));
- scoped_ptr<Widget> widget(new Widget);
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(50, 50, 350, 350);
« no previous file with comments | « ui/views/view_targeter_unittest.cc ('k') | ui/views/view_unittest_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698