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

Unified Diff: ui/views/view_unittest.cc

Issue 1440593004: Make operators on scoped_ptr match the ones defined for std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrequals: followupfix-after-rebase Created 5 years, 1 month 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/touchui/touch_selection_controller_impl.cc ('k') | no next file » | 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 38683cc303a93c5be3645c0793ad4adea9bf0993..75fa552f5d5700033251632cbb5905967945c619 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -2169,11 +2169,11 @@ TEST_F(ViewTest, MAYBE_NativeViewHierarchyChanged) {
EXPECT_EQ(NULL, observer_view->toplevel());
child->SetContentsView(observer_view);
- EXPECT_EQ(toplevel1, observer_view->toplevel());
+ EXPECT_EQ(toplevel1.get(), observer_view->toplevel());
Widget::ReparentNativeView(child->GetNativeView(),
toplevel2->GetNativeView());
- EXPECT_EQ(toplevel2, observer_view->toplevel());
+ EXPECT_EQ(toplevel2.get(), observer_view->toplevel());
observer_view->parent()->RemoveChildView(observer_view);
EXPECT_EQ(NULL, observer_view->toplevel());
@@ -3921,7 +3921,7 @@ TEST_F(ViewLayerTest, RecreateLayerZOrder) {
const std::vector<ui::Layer*>& child_layers_post = v->layer()->children();
ASSERT_EQ(3u, child_layers_post.size());
EXPECT_EQ(v1->layer(), child_layers_post[0]);
- EXPECT_EQ(v1_old_layer, child_layers_post[1]);
+ EXPECT_EQ(v1_old_layer.get(), child_layers_post[1]);
EXPECT_EQ(v2->layer(), child_layers_post[2]);
}
@@ -3952,7 +3952,7 @@ TEST_F(ViewLayerTest, RecreateLayerZOrderWidgetParent) {
const std::vector<ui::Layer*>& child_layers_post = root_layer->children();
ASSERT_EQ(3u, child_layers_post.size());
EXPECT_EQ(v1->layer(), child_layers_post[0]);
- EXPECT_EQ(v1_old_layer, child_layers_post[1]);
+ EXPECT_EQ(v1_old_layer.get(), child_layers_post[1]);
EXPECT_EQ(v2->layer(), child_layers_post[2]);
}
« no previous file with comments | « ui/views/touchui/touch_selection_controller_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698