Add WidgetTest::GetAllWidgets() to find dialogs created by TestBrowserDialog.

chrome/browser/ui/test/test_browser_dialog.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/test/test_browser_dialog.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/gtest_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/platform_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/base/test/user_interactive_test_case.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
+#if defined(USE_ASH)

[sky, 2017/01/30 17:07:04]

USE_ASH is going to become OS_CHROMEOS, so you may as well start using it now.

[tapted, 2017/01/30 23:36:31]

Done.

+#include "ash/shell.h"  // nogncheck
+#endif
+
 namespace {
 
 // An automatic action for WidgetCloser to post to the RunLoop.
 // TODO(tapted): Explore asynchronous Widget::Close() and DialogClientView::
 // {Accept,Cancel}Window() approaches to test other dialog lifetimes.
 enum class DialogAction {
   INTERACTIVE,  // Run interactively.
   CLOSE_NOW,    // Call Widget::CloseNow().
 };
 
@@ skipping 50 matching lines @@
   // The rest of this method assumes the child dialog is toolkit-views. So, for
   // Mac, it will only work if --secondary-ui-md is passed. Without this, a
   // Cocoa dialog will be created, which TestBrowserDialog doesn't support.
   // Force SecondaryUiMaterial() on Mac to get coverage on the bots. Leave it
   // optional elsewhere so that the non-MD dialog can be invoked to compare.
   ui::test::MaterialDesignControllerTestAPI md_test_api(
       ui::MaterialDesignController::GetMode());
   md_test_api.SetSecondaryUiMaterial(true);
 #endif
 
-  gfx::NativeView parent = platform_util::GetViewForWindow(DialogParent());
-  views::Widget::Widgets widgets_before;
-  views::Widget::GetAllChildWidgets(parent, &widgets_before);
+  views::Widget::Widgets widgets_before =
+      views::test::WidgetTest::GetAllWidgets();
+#if defined(USE_ASH)
+  // GetAllWidgets() uses AuraTestHelper to find the aura root window, but
+  // that's not used on browser_tests, so ask ash.
+  views::Widget::GetAllChildWidgets(ash::Shell::GetPrimaryRootWindow(),

[sky, 2017/01/30 17:07:04]

I assume only the primary display is ok for tests, right?

[tapted, 2017/01/30 23:36:31]

Yes, I think it should be correct for these tests. The dialog should always pop
on the same display as InProcessBrowserTest's browser() instance.

+                                    &widgets_before);
+#endif  // USE_ASH
 
   ShowDialog(NameFromTestCase());
-  views::Widget::Widgets widgets_after;
-  views::Widget::GetAllChildWidgets(parent, &widgets_after);
+  views::Widget::Widgets widgets_after =
+      views::test::WidgetTest::GetAllWidgets();
+#if defined(USE_ASH)
+  views::Widget::GetAllChildWidgets(ash::Shell::GetPrimaryRootWindow(),
+                                    &widgets_after);
+#endif  // USE_ASH
 
   auto added = base::STLSetDifference<std::vector<views::Widget*>>(
       widgets_after, widgets_before);
 
   // This can fail if no dialog was shown, if the dialog shown wasn't a toolkit-
   // views dialog, or if more than one child dialog was shown.
   ASSERT_EQ(1u, added.size());
 
   const DialogAction action = base::CommandLine::ForCurrentProcess()->HasSwitch(
                                   internal::kInteractiveSwitch)
                                   ? DialogAction::INTERACTIVE
                                   : DialogAction::CLOSE_NOW;
 
   WidgetCloser closer(added[0], action);
   ::test::RunTestInteractively();
 }