Change Widget::GetAllOwnedWidgets to return child widgets as well

chrome/browser/ui/app_list/app_list_service_views_browsertest.cc

Index: chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
diff --git a/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc b/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
index 44ab3bbc1a879b2b70ffeee680dc1def1c742356..5d64a59a0d2e7812f213cacfc49ef6322fcc583b 100644
--- a/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
@@ -125,9 +125,8 @@ IN_PROC_BROWSER_TEST_F(AppListServiceViewsBrowserTest, AcceleratorClose) {
 typedef ExtensionBrowserTest AppListControllerAppInfoDialogBrowserTest;
 
 // Test the DoShowAppInfoFlow function of the controller delegate.
-// flaky: http://crbug.com/378251
 IN_PROC_BROWSER_TEST_F(AppListControllerAppInfoDialogBrowserTest,
-                       DISABLED_DoShowAppInfoFlow) {
+                       DoShowAppInfoFlow) {
   // Install an extension to open the dialog for.
   base::FilePath test_extension_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_extension_path));
@@ -152,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(AppListControllerAppInfoDialogBrowserTest,
 
   // Open the app info dialog.
   views::Widget::Widgets owned_widgets;
-  views::Widget::GetAllOwnedWidgets(native_view, &owned_widgets);
+  views::Widget::GetAllChildAndOwnedWidgets(native_view, &owned_widgets);
   EXPECT_EQ(0U, owned_widgets.size());
   EXPECT_FALSE(test_api.is_overlay_visible());
 
@@ -162,7 +161,7 @@ IN_PROC_BROWSER_TEST_F(AppListControllerAppInfoDialogBrowserTest,
   controller->DoShowAppInfoFlow(browser()->profile(), extension->id());
 
   owned_widgets.clear();
-  views::Widget::GetAllOwnedWidgets(native_view, &owned_widgets);
+  views::Widget::GetAllChildAndOwnedWidgets(native_view, &owned_widgets);
   EXPECT_EQ(1U, owned_widgets.size());
   EXPECT_TRUE(test_api.is_overlay_visible());
 
@@ -171,7 +170,7 @@ IN_PROC_BROWSER_TEST_F(AppListControllerAppInfoDialogBrowserTest,
   app_info_dialog->CloseNow();
 
   owned_widgets.clear();
-  views::Widget::GetAllOwnedWidgets(native_view, &owned_widgets);
+  views::Widget::GetAllChildAndOwnedWidgets(native_view, &owned_widgets);
   EXPECT_EQ(0U, owned_widgets.size());
   EXPECT_FALSE(test_api.is_overlay_visible());
 }