Wires up ShouldDescendIntoChildForEventHandling() for DesktopNativeWidgetAura

ui/views/view_unittest_aura.cc

 // Copyright 2014 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 "ui/views/view.h"
 
 #include <memory>
 
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
@@ skipping 25 matching lines @@
 View* CreateViewWithLayer(const gfx::Rect& bounds, const char* layer_name) {
   View* view = new View();
   view->SetBoundsRect(bounds);
   view->SetPaintToLayer();
   view->layer()->set_name(layer_name);
   return view;
 }
 
 }  // namespace
 
-typedef ViewsTestBase ViewAuraTest;
+class ViewAuraTest : public ViewsTestBase {
+ public:
+  ViewAuraTest() {}
+  ~ViewAuraTest() override {}
+
+  const View::Views& GetViewsWithLayers(Widget* widget) {
+    return widget->GetViewsWithLayers();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ViewAuraTest);
+};
 
 // Test that wm::RecreateLayers() recreates the layers for all child windows and
 // all child views and that the z-order of the recreated layers matches that of
 // the original layers.
 // Test hierarchy:
 // w1
 // +-- v1
 // +-- v2 (no layer)
 //     +-- v3 (no layer)
 //     +-- v4
@@ skipping 55 matching lines @@
   ui::Layer* w1_layer = w1->GetNativeView()->layer();
   ASSERT_EQ("w1", w1_layer->name());
   ASSERT_EQ("v1 v4 w2 v7", ui::test::ChildLayerNamesAsString(*w1_layer));
   ui::Layer* w2_layer = w1_layer->children()[2];
   ASSERT_EQ("v5", ui::test::ChildLayerNamesAsString(*w2_layer));
   ui::Layer* v5_layer = w2_layer->children()[0];
   ASSERT_EQ("v6", ui::test::ChildLayerNamesAsString(*v5_layer));
 
   // Verify the value of Widget::GetRootLayers(). It should only include layers
   // from layer-backed Views descended from the Widget's root View.
-  std::vector<ui::Layer*> old_w1_root_sublayers = w1->GetRootLayers();
-  ASSERT_EQ(3u, old_w1_root_sublayers.size());
-  EXPECT_EQ(v1_layer, old_w1_root_sublayers[0]);
-  EXPECT_EQ(v4_layer, old_w1_root_sublayers[1]);
-  EXPECT_EQ(v7_layer, old_w1_root_sublayers[2]);
+  View::Views old_w1_views_with_layers = GetViewsWithLayers(w1);
+  ASSERT_EQ(3u, old_w1_views_with_layers.size());
+  EXPECT_EQ(v1, old_w1_views_with_layers[0]);
+  EXPECT_EQ(v4, old_w1_views_with_layers[1]);
+  EXPECT_EQ(v7, old_w1_views_with_layers[2]);
 
   {
     std::unique_ptr<ui::LayerTreeOwner> cloned_owner(
         wm::RecreateLayers(w1->GetNativeView()));
     EXPECT_EQ(w1_layer, cloned_owner->root());
     EXPECT_NE(w1_layer, w1->GetNativeView()->layer());
 
     // The old layers should still exist and have the same hierarchy.
     ASSERT_EQ("w1", w1_layer->name());
     ASSERT_EQ("v1 v4 w2 v7", ui::test::ChildLayerNamesAsString(*w1_layer));
@@ skipping 30 matching lines @@
     EXPECT_NE(v1_layer, v1_new_layer);
     EXPECT_NE(v4_layer, v4_new_layer);
     ui::Layer* w2_new_layer = w1_new_layer->children()[2];
     ASSERT_EQ("v5", ui::test::ChildLayerNamesAsString(*w2_new_layer));
     ui::Layer* v5_new_layer = w2_new_layer->children()[0];
     ASSERT_EQ("v6", ui::test::ChildLayerNamesAsString(*v5_new_layer));
     ui::Layer* v7_new_layer = w1_new_layer->children()[3];
     ASSERT_EQ("v8 v9", ui::test::ChildLayerNamesAsString(*v7_new_layer));
     EXPECT_NE(v7_layer, v7_new_layer);
 
-    // Ensure Widget::GetRootLayers() is correctly updated.
-    std::vector<ui::Layer*> new_w1_root_sublayers = w1->GetRootLayers();
-    ASSERT_EQ(3u, new_w1_root_sublayers.size());
-    EXPECT_EQ(v1_new_layer, new_w1_root_sublayers[0]);
-    EXPECT_EQ(v4_new_layer, new_w1_root_sublayers[1]);
-    EXPECT_EQ(v7_new_layer, new_w1_root_sublayers[2]);
+    // Ensure Widget::GetViewsWithLayers() is correctly updated.
+    View::Views new_w1_views_with_layers = GetViewsWithLayers(w1);
+    ASSERT_EQ(3u, new_w1_views_with_layers.size());
+    EXPECT_EQ(v1, new_w1_views_with_layers[0]);
+    EXPECT_EQ(v4, new_w1_views_with_layers[1]);
+    EXPECT_EQ(v7, new_w1_views_with_layers[2]);
   }
   w1->CloseNow();
 }
 
 }  // namespace views