Commit 2429b205 authored by Wei Li's avatar Wei Li Committed by Commit Bot

Remove set_owned_by_client() from tests

Remove the last few uses of set_owned_by_client() in tests. After this
change, the only one case left is testing the set_owned_by_client()'s
behavior itself.

Bug: 1044687
Change-Id: I29a5d3aa307040899dbfab10bed7f2bf834bc8a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2388990Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Wei Li <weili@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804052}
parent af2d6213
......@@ -28,7 +28,6 @@ using MenuItemViewUnitTest = ViewsTestBase;
TEST_F(MenuItemViewUnitTest, AddAndRemoveChildren) {
views::TestMenuItemView root_menu;
root_menu.set_owned_by_client();
auto* item = root_menu.AppendMenuItem(0);
......@@ -60,7 +59,6 @@ class SquareView : public views::View {
TEST_F(MenuItemViewUnitTest, TestMenuItemViewWithFlexibleWidthChild) {
views::TestMenuItemView root_menu;
root_menu.set_owned_by_client();
// Append a normal MenuItemView.
views::MenuItemView* label_view =
......@@ -191,10 +189,9 @@ class MenuItemViewLayoutTest : public ViewsTestBase {
void PerformLayout() {
// SubmenuView does not lay out its children unless it is contained in a
// view. Make a simple container for it. We have to call
// set_owned_by_client() since |submenu| is owned by |root_menu|.
// view, so make a simple container for it.
SubmenuView* submenu = root_menu_.GetSubmenu();
submenu->set_owned_by_client();
ASSERT_TRUE(submenu->owned_by_client());
submenu_parent_ = std::make_unique<View>();
submenu_parent_->AddChildView(submenu);
......
This diff is collapsed.
......@@ -1488,10 +1488,9 @@ TEST_F(WidgetTest, EventHandlersOnRootView) {
WidgetAutoclosePtr widget(CreateTopLevelNativeWidget());
View* root_view = widget->GetRootView();
std::unique_ptr<EventCountView> view(new EventCountView());
view->set_owned_by_client();
EventCountView* view =
root_view->AddChildView(std::make_unique<EventCountView>());
view->SetBounds(0, 0, 20, 20);
root_view->AddChildView(view.get());
EventCountHandler h1;
root_view->AddPreTargetHandler(&h1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment