MacViews: Support MODAL_TYPE_WINDOW in dialog tests.

ui/views/widget/widget_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <memory>
 #include <set>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 2959 matching lines @@
   Widget* w22 = CreateChildPlatformWidget(w2->GetNativeView());
 
   std::set<Widget*> expected;
   expected.insert(toplevel.get());
   expected.insert(w1);
   expected.insert(w11);
   expected.insert(w2);
   expected.insert(w21);
   expected.insert(w22);
 
-  std::set<Widget*> widgets;
-  Widget::GetAllChildWidgets(toplevel->GetNativeView(), &widgets);
+  std::set<Widget*> child_widgets;
+  Widget::GetAllChildWidgets(toplevel->GetNativeView(), &child_widgets);
 
-  EXPECT_EQ(expected.size(), widgets.size());
-  EXPECT_TRUE(std::equal(expected.begin(), expected.end(), widgets.begin()));
+  EXPECT_EQ(expected.size(), child_widgets.size());
+  EXPECT_TRUE(
+      std::equal(expected.begin(), expected.end(), child_widgets.begin()));
+
+  // Check GetAllOwnedWidgets(). On Aura, this includes "transient" children.
+  // Otherwise (on all platforms), it should be the same as GetAllChildWidgets()
+  // except the root Widget is not included.
+  EXPECT_EQ(1u, expected.erase(toplevel.get()));
+
+  std::set<Widget*> owned_widgets;
+  Widget::GetAllOwnedWidgets(toplevel->GetNativeView(), &owned_widgets);
+
+  EXPECT_EQ(expected.size(), owned_widgets.size());
+  EXPECT_TRUE(
+      std::equal(expected.begin(), expected.end(), owned_widgets.begin()));
 }
 
 // Used by DestroyChildWidgetsInOrder. On destruction adds the supplied name to
 // a vector.
 class DestroyedTrackingView : public View {
  public:
   DestroyedTrackingView(const std::string& name,
                         std::vector<std::string>* add_to)
       : name_(name),
         add_to_(add_to) {
@@ skipping 864 matching lines @@
 }
 
 TEST_F(CompositingWidgetTest, Transparency_DesktopWidgetTranslucent) {
   CheckAllWidgetsForOpacity(Widget::InitParams::TRANSLUCENT_WINDOW);
 }
 
 #endif  // !defined(OS_CHROMEOS)
 
 }  // namespace test
 }  // namespace views