MacViews: Harmony for toolbar actions bubbles.

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"
@@ skipping 93 matching lines @@
   views::Widget::Widgets widgets_after =
       views::test::WidgetTest::GetAllWidgets();
 #if defined(OS_CHROMEOS)
   views::Widget::GetAllChildWidgets(ash::Shell::GetPrimaryRootWindow(),
                                     &widgets_after);
 #endif  // OS_CHROMEOS
 
   auto added = base::STLSetDifference<std::vector<views::Widget*>>(
       widgets_after, widgets_before);
 
+  if (added.size() > 1) {
+    // Some tests create a standalone window to anchor a dialog. In those cases,
+    // ignore added Widgets that are not dialogs.
+    for (auto it = added.begin(); it != added.end();) {
+      if (!(*it)->widget_delegate()->AsDialogDelegate())
+        it = added.erase(it);
+      else
+        ++it;
+    }
+  }
+
   // 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();
 }