Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

ui/views/widget/widget_unittest.cc

Index: ui/views/widget/widget_unittest.cc
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index ec0f1eb5cc8a4a66b0a81ad8bf0bfd9c254b4b2b..89dc14d830b24da5a2e084f4656ffbf249722cf2 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -310,13 +310,15 @@ TEST_F(WidgetTest, ChildStackedRelativeToParent) {
   popover->SetBounds(gfx::Rect(150, 90, 340, 240));
   popover->Show();
 
-  EXPECT_TRUE(IsWindowStackedAbove(popover.get(), child));
+  if (!IsAuraMusClient())

[msw, 2016/11/11 00:29:25]

Definitely cite a bug here; maybe just early return at the top?

[sky, 2016/11/11 01:09:14]

The problem is for aura-mus-client top level z-order calculation as this
function does isn't possible. The reason for that is IsWindowStackedAbove
calculates z-order using layers, which isn't applicable for
DesktopNativeWidgetAura. To really calculate top-level z-order requires api on
mus. AFAICT we don't actually need to calculate z-order of top levels, which is
why I didn't reference any bug here.

It's possible we could add a test api to calculate z-order, but I would rather
hold off on that.

As to an early out, I didn't as the other tests are useful.

[msw, 2016/11/11 01:25:40]

Thanks for explaining and adding a comment. I'd say it still a *little*
confusing as-is with some IsWindowStackedAbove checks skipped, and others not
(but readers might understand the distinction between top-level and parent-child
ordering checks?). It might be nice if the top-level z-order checks were in
their own test fixture, where a single early return there would make sense, and
have another text fixture with the checks that work in both environments. But
I'll leave it up to you.

+    EXPECT_TRUE(IsWindowStackedAbove(popover.get(), child));
   EXPECT_TRUE(IsWindowStackedAbove(child, parent.get()));
 
   // Showing the parent again should raise it and its child above the popover.
   parent->Show();
   EXPECT_TRUE(IsWindowStackedAbove(child, parent.get()));
-  EXPECT_TRUE(IsWindowStackedAbove(parent.get(), popover.get()));
+  if (!IsAuraMusClient())
+    EXPECT_TRUE(IsWindowStackedAbove(parent.get(), popover.get()));
 
   // Test grandchildren.
   Widget* grandchild = CreateChildPlatformWidget(child->GetNativeView());
@@ -324,15 +326,18 @@ TEST_F(WidgetTest, ChildStackedRelativeToParent) {
   grandchild->ShowInactive();
   EXPECT_TRUE(IsWindowStackedAbove(grandchild, child));
   EXPECT_TRUE(IsWindowStackedAbove(child, parent.get()));
-  EXPECT_TRUE(IsWindowStackedAbove(parent.get(), popover.get()));
+  if (!IsAuraMusClient())
+    EXPECT_TRUE(IsWindowStackedAbove(parent.get(), popover.get()));
 
   popover->Show();
-  EXPECT_TRUE(IsWindowStackedAbove(popover.get(), grandchild));
+  if (!IsAuraMusClient())
+    EXPECT_TRUE(IsWindowStackedAbove(popover.get(), grandchild));
   EXPECT_TRUE(IsWindowStackedAbove(grandchild, child));
 
   parent->Show();
   EXPECT_TRUE(IsWindowStackedAbove(grandchild, child));
-  EXPECT_TRUE(IsWindowStackedAbove(child, popover.get()));
+  if (!IsAuraMusClient())
+    EXPECT_TRUE(IsWindowStackedAbove(child, popover.get()));
 
   // Test hiding and reshowing.
   parent->Hide();
@@ -341,7 +346,8 @@ TEST_F(WidgetTest, ChildStackedRelativeToParent) {
 
   EXPECT_TRUE(IsWindowStackedAbove(grandchild, child));
   EXPECT_TRUE(IsWindowStackedAbove(child, parent.get()));
-  EXPECT_TRUE(IsWindowStackedAbove(parent.get(), popover.get()));
+  if (!IsAuraMusClient())
+    EXPECT_TRUE(IsWindowStackedAbove(parent.get(), popover.get()));
 
   grandchild->Hide();
   EXPECT_FALSE(grandchild->IsVisible());
@@ -349,7 +355,8 @@ TEST_F(WidgetTest, ChildStackedRelativeToParent) {
 
   EXPECT_TRUE(IsWindowStackedAbove(grandchild, child));
   EXPECT_TRUE(IsWindowStackedAbove(child, parent.get()));
-  EXPECT_TRUE(IsWindowStackedAbove(parent.get(), popover.get()));
+  if (!IsAuraMusClient())
+    EXPECT_TRUE(IsWindowStackedAbove(parent.get(), popover.get()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -847,6 +854,10 @@ TEST_F(WidgetObserverTest, DISABLED_VisibilityChange) {
 }
 
 TEST_F(WidgetObserverTest, DestroyBubble) {
+  // TODO: reenable once http://crbug.com/663903 is fixed.
+  if (IsAuraMusClient())
+    return;
+
   // This test expect NativeWidgetAura, force its creation.
   ViewsDelegate::GetInstance()->set_native_widget_factory(
       ViewsDelegate::NativeWidgetFactory());
@@ -1275,10 +1286,9 @@ TEST_F(WidgetTest, DISABLED_FocusChangesOnBubble) {
 }
 
 TEST_F(WidgetTest, BubbleControlsResetOnInit) {
-  // This test creates a NativeWidgetAura and then a bubble parented to it. This
-  // means the test needs a NativeWidgetAura for the bubble as well.
-  ViewsDelegate::GetInstance()->set_native_widget_factory(
-      ViewsDelegate::NativeWidgetFactory());
+  // TODO: enable once http://crbug.com/660994 is fixed.
+  if (IsAuraMusClient())
+    return;
 
   WidgetAutoclosePtr anchor(CreateTopLevelPlatformWidget());
   anchor->Show();
@@ -1698,7 +1708,7 @@ TEST_F(WidgetTest, SynthesizeMouseMoveEvent) {
 
   gfx::Point cursor_location(5, 5);
   ui::test::EventGenerator generator(
-      IsMus() ? widget->GetNativeWindow() : GetContext(),
+      IsMus() || IsAuraMusClient() ? widget->GetNativeWindow() : GetContext(),
       widget->GetNativeWindow());
   generator.MoveMouseTo(cursor_location);
 
@@ -1755,9 +1765,10 @@ TEST_F(WidgetTest, MouseEventDispatchWhileTouchIsDown) {
   event_count_view->AddPostTargetHandler(&consumer);
 
   std::unique_ptr<ui::test::EventGenerator> generator(
-      new ui::test::EventGenerator(
-          IsMus() ? widget->GetNativeWindow() : GetContext(),
-          widget->GetNativeWindow()));
+      new ui::test::EventGenerator(IsMus() || IsAuraMusClient()

[msw, 2016/11/11 00:29:24]

nit: MakeUnique here and elsewhere.

[sky, 2016/11/11 01:09:14]

I converted these to be values, e.g. not use EventGenerator.

+                                       ? widget->GetNativeWindow()
+                                       : GetContext(),
+                                   widget->GetNativeWindow()));
   generator->PressTouch();
   generator->ClickLeftButton();
 
@@ -1788,9 +1799,10 @@ TEST_F(WidgetTest, MousePressCausesCapture) {
   MousePressEventConsumer consumer;
   event_count_view->AddPostTargetHandler(&consumer);
   std::unique_ptr<ui::test::EventGenerator> generator(
-      new ui::test::EventGenerator(
-          IsMus() ? widget->GetNativeWindow() : GetContext(),
-          widget->GetNativeWindow()));
+      new ui::test::EventGenerator(IsMus() || IsAuraMusClient()
+                                       ? widget->GetNativeWindow()
+                                       : GetContext(),
+                                   widget->GetNativeWindow()));
   generator->PressLeftButton();
 
   EXPECT_EQ(1, event_count_view->GetEventCount(ui::ET_MOUSE_PRESSED));
@@ -1852,9 +1864,10 @@ TEST_F(WidgetTest, CaptureDuringMousePressNotOverridden) {
   CaptureEventConsumer consumer(widget2);
   event_count_view->AddPostTargetHandler(&consumer);
   std::unique_ptr<ui::test::EventGenerator> generator(
-      new ui::test::EventGenerator(
-          IsMus() ? widget->GetNativeWindow() : GetContext(),
-          widget->GetNativeWindow()));
+      new ui::test::EventGenerator(IsMus() || IsAuraMusClient()
+                                       ? widget->GetNativeWindow()
+                                       : GetContext(),
+                                   widget->GetNativeWindow()));
   // This event should implicitly give capture to |widget|, except that
   // |consumer| will explicitly set capture on |widget2|.
   generator->PressLeftButton();
@@ -1946,6 +1959,11 @@ TEST_F(WidgetTest, WidgetDeleted_InOnMousePressed) {
     NOTIMPLEMENTED();
     return;
   }
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   Widget* widget = new Widget;
   Widget::InitParams params =
       CreateParams(views::Widget::InitParams::TYPE_POPUP);
@@ -1972,6 +1990,10 @@ TEST_F(WidgetTest, WidgetDeleted_InDispatchGestureEvent) {
   // This test doesn't make sense for mus.
   if (IsMus())
     return;
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
 
   Widget* widget = new Widget;
   Widget::InitParams params =
@@ -2199,6 +2221,11 @@ TEST_F(WidgetTest, NoCrashOnWidgetDelete) {
 // Tests that we do not crash when a Widget is destroyed before it finishes
 // processing of pending input events in the message loop.
 TEST_F(WidgetTest, NoCrashOnWidgetDeleteWithPendingEvents) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   std::unique_ptr<Widget> widget(new Widget);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
@@ -3239,6 +3266,11 @@ TEST_F(WidgetTest, IsActiveFromDestroy) {
 // Tests that events propagate through from the dispatcher with the correct
 // event type, and that the different platforms behave the same.
 TEST_F(WidgetTest, MouseEventTypesViaGenerator) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   EventCountView* view = new EventCountView;
   view->set_handle_mode(EventCountView::CONSUME_EVENTS);
   view->SetBounds(10, 10, 50, 40);
@@ -3550,6 +3582,11 @@ class ScaleFactorView : public View {
 
 // Ensure scale factor changes are propagated from the native Widget.
 TEST_F(WidgetTest, OnDeviceScaleFactorChanged) {
+  // This relies on the NativeWidget being the WindowDelegate, which is not the
+  // case for aura-mus-client.
+  if (IsAuraMusClient())
+    return;
+
   // Automatically close the widget, but not delete it.
   WidgetAutoclosePtr widget(CreateTopLevelPlatformWidget());
   ScaleFactorView* view = new ScaleFactorView;
@@ -3643,6 +3680,11 @@ TEST_F(WidgetTest, WidgetRemovalsObserverCalledWhenMovingBetweenWidgets) {
 
 // Test dispatch of ui::ET_MOUSEWHEEL.
 TEST_F(WidgetTest, MouseWheelEvent) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   WidgetAutoclosePtr widget(CreateTopLevelPlatformWidget());
   widget->SetBounds(gfx::Rect(0, 0, 600, 600));
   EventCountView* event_count_view = new EventCountView();