Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

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 292 matching lines @@
 
   parent->Show();
   EXPECT_TRUE(child->IsVisible());
   EXPECT_TRUE(IsWindowStackedAbove(child, parent.get()));
   EXPECT_FALSE(IsWindowStackedAbove(parent.get(), child));  // Sanity check.
 
   WidgetAutoclosePtr popover(CreateTopLevelPlatformWidget());
   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());
   grandchild->SetBounds(gfx::Rect(5, 5, 15, 10));
   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();
   EXPECT_FALSE(grandchild->IsVisible());
   parent->Show();
 
   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());
   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()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget ownership tests.
 //
 // Tests various permutations of Widget ownership specified in the
 // InitParams::Ownership param.
 
 // A WidgetTest that supplies a toplevel widget for NativeWidget to parent to.
 class WidgetOwnershipTest : public WidgetTest {
@@ skipping 477 matching lines @@
   EXPECT_EQ(child2, widget_hidden());
 
   child1->Show();
   EXPECT_EQ(child1, widget_shown());
 
   child2->Show();
   EXPECT_EQ(child2, widget_shown());
 }
 
 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());
 
   WidgetAutoclosePtr anchor(CreateTopLevelPlatformWidget());
   anchor->Show();
 
   BubbleDialogDelegateView* bubble_delegate =
       new TestBubbleDialogDelegateView(anchor->client_view());
   {
@@ skipping 408 matching lines @@
   EXPECT_FALSE(contents_view->HasFocus());
   EXPECT_TRUE(bubble_delegate_view->HasFocus());
 
   bubble_delegate_view->GetWidget()->CloseNow();
 
   // Closing the bubble should result in focus going back to the contents view.
   EXPECT_TRUE(contents_view->HasFocus());
 }
 
 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();
 
   {
     TestBubbleDialogDelegateView* bubble_delegate =
         new TestBubbleDialogDelegateView(anchor->client_view());
     WidgetAutoclosePtr bubble_widget(
         BubbleDialogDelegateView::CreateBubble(bubble_delegate));
     EXPECT_TRUE(bubble_delegate->reset_controls_called_);
@@ skipping 399 matching lines @@
 
   widget->Show();
 
   // SynthesizeMouseMoveEvent does nothing until the mouse is entered.
   widget->SynthesizeMouseMoveEvent();
   EXPECT_EQ(0, v1->GetEventCount(ui::ET_MOUSE_MOVED));
   EXPECT_EQ(0, v2->GetEventCount(ui::ET_MOUSE_MOVED));
 
   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);
 
   EXPECT_EQ(1, v1->GetEventCount(ui::ET_MOUSE_MOVED));
   EXPECT_EQ(0, v2->GetEventCount(ui::ET_MOUSE_MOVED));
 
   // SynthesizeMouseMoveEvent dispatches an mousemove event.
   widget->SynthesizeMouseMoveEvent();
   EXPECT_EQ(2, v1->GetEventCount(ui::ET_MOUSE_MOVED));
 
@@ skipping 36 matching lines @@
   widget->SetSize(gfx::Size(300, 300));
 
   EventCountView* event_count_view = new EventCountView();
   event_count_view->SetBounds(0, 0, 300, 300);
   widget->GetRootView()->AddChildView(event_count_view);
 
   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()

[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();
 
   EXPECT_EQ(1, event_count_view->GetEventCount(ui::ET_MOUSE_PRESSED));
   EXPECT_EQ(1, event_count_view->GetEventCount(ui::ET_MOUSE_RELEASED));
 
   // For mus it's important we destroy the widget before the EventGenerator.
   widget->CloseNow();
 }
 
@@ skipping 10 matching lines @@
   event_count_view->SetBounds(0, 0, 300, 300);
   widget->GetRootView()->AddChildView(event_count_view);
 
   // No capture has been set.
   EXPECT_EQ(nullptr, internal::NativeWidgetPrivate::GetGlobalCapture(
                          widget->GetNativeView()));
 
   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));
   EXPECT_EQ(
       widget->GetNativeView(),
       internal::NativeWidgetPrivate::GetGlobalCapture(widget->GetNativeView()));
 
   // For mus it's important we destroy the widget before the EventGenerator.
   widget->CloseNow();
 }
@@ skipping 41 matching lines @@
   widget->GetRootView()->AddChildView(event_count_view);
 
   EXPECT_EQ(nullptr, internal::NativeWidgetPrivate::GetGlobalCapture(
                          widget->GetNativeView()));
 
   Widget* widget2 = CreateTopLevelNativeWidget();
   // Gives explicit capture to |widget2|
   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();
 
   EXPECT_EQ(1, event_count_view->GetEventCount(ui::ET_MOUSE_PRESSED));
   EXPECT_NE(
       widget->GetNativeView(),
       internal::NativeWidgetPrivate::GetGlobalCapture(widget->GetNativeView()));
   EXPECT_EQ(
       widget2->GetNativeView(),
@@ skipping 71 matching lines @@
 
 TEST_F(WidgetTest, WidgetDeleted_InOnMousePressed) {
   // This test doesn't work in mus as it assumes widget and GetContext()
   // share an aura hierarchy. Test coverage of deletion from mouse pressed is
   // important though and should be added, hence the NOTIMPLEMENTED().
   // http://crbug.com/594260.
   if (IsMus()) {
     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);
   widget->Init(params);
 
   widget->SetContentsView(new CloseWidgetView(ui::ET_MOUSE_PRESSED));
 
   widget->SetSize(gfx::Size(100, 100));
   widget->Show();
 
   ui::test::EventGenerator generator(GetContext(), widget->GetNativeWindow());
 
   WidgetDeletionObserver deletion_observer(widget);
   generator.ClickLeftButton();
   EXPECT_FALSE(deletion_observer.IsWidgetAlive());
 
   // Yay we did not crash!
 }
 
 // No touch on desktop Mac. Tracked in http://crbug.com/445520.
 #if !defined(OS_MACOSX) || defined(USE_AURA)
 
 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 =
       CreateParams(views::Widget::InitParams::TYPE_POPUP);
   widget->Init(params);
 
   widget->SetContentsView(new CloseWidgetView(ui::ET_GESTURE_TAP_DOWN));
 
   widget->SetSize(gfx::Size(100, 100));
   widget->Show();
@@ skipping 207 matching lines @@
 TEST_F(WidgetTest, NoCrashOnWidgetDelete) {
   std::unique_ptr<Widget> widget(new Widget);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
 }
 
 // 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);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
   widget->Show();
 
   ui::test::EventGenerator generator(GetContext(), widget->GetNativeWindow());
   generator.MoveMouseTo(10, 10);
 
@@ skipping 1020 matching lines @@
   child_widget.AddObserver(&observer);
   child_widget.Show();
 
   parent_widget.CloseNow();
 }
 #endif  // !defined(OS_CHROMEOS)
 
 // 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);
 
   WidgetAutoclosePtr widget(CreateTopLevelFramelessPlatformWidget());
   widget->GetRootView()->AddChildView(view);
 
   widget->SetBounds(gfx::Rect(0, 0, 100, 80));
   widget->Show();
 
@@ skipping 291 matching lines @@
  private:
   float last_scale_factor_ = 0.f;
 
   DISALLOW_COPY_AND_ASSIGN(ScaleFactorView);
 };
 
 }
 
 // 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;
   widget->GetRootView()->AddChildView(view);
   float scale_factor = widget->GetLayer()->device_scale_factor();
   EXPECT_NE(scale_factor, 0.f);
 
   // For views that are not layer-backed, adding the view won't notify the view
   // about the initial scale factor. Fake it.
   view->OnDeviceScaleFactorChanged(scale_factor);
@@ skipping 73 matching lines @@
   // Moving the child to a different widget should call the removals observer.
   WidgetAutoclosePtr widget2(CreateTopLevelPlatformWidget());
   widget2->client_view()->AddChildView(child);
   EXPECT_TRUE(removals_observer.DidRemoveView(child));
 
   widget->RemoveRemovalsObserver(&removals_observer);
 }
 
 // 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();
   widget->GetContentsView()->AddChildView(event_count_view);
   event_count_view->SetBounds(0, 0, 600, 600);
   widget->Show();
 
   ui::test::EventGenerator event_generator(GetContext(),
                                            widget->GetNativeWindow());
 
@@ skipping 201 matching lines @@
     Transparency_DesktopWidgetTranslucent
 #endif
 TEST_F(CompositingWidgetTest, MAYBE_Transparency_DesktopWidgetTranslucent) {
   CheckAllWidgetsForOpacity(Widget::InitParams::TRANSLUCENT_WINDOW);
 }
 
 #endif  // !defined(OS_CHROMEOS)
 
 }  // namespace test
 }  // namespace views