Change Widget::GetAllOwnedWidgets to return child widgets as well

ui/views/widget/widget_unittest.cc

Index: ui/views/widget/widget_unittest.cc
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 374435f6b038fa0de5b389f73b05e601a26e2f45..b41241ed51e6df52f744e1d8269f4ee8576d3caa 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -2666,8 +2666,8 @@ TEST_F(WidgetTest, DisabledGestureEventTarget) {
   widget->Close();
 }
 
-// Test the result of Widget::GetAllChildWidgets().
-TEST_F(WidgetTest, GetAllChildWidgets) {
+// Test the result of Widget::GetAllChildAndOwnedWidgets().
+TEST_F(WidgetTest, GetAllChildAndOwnedWidgets) {
   // Create the following widget hierarchy:
   //
   // toplevel
@@ -2692,7 +2692,7 @@ TEST_F(WidgetTest, GetAllChildWidgets) {
   expected.insert(w22);
 
   std::set<Widget*> widgets;
-  Widget::GetAllChildWidgets(toplevel->GetNativeView(), &widgets);
+  Widget::GetAllChildAndOwnedWidgets(toplevel->GetNativeView(), &widgets);
 
   EXPECT_EQ(expected.size(), widgets.size());
   EXPECT_TRUE(std::equal(expected.begin(), expected.end(), widgets.begin()));