Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

ui/views/touchui/touch_selection_menu_runner_views_unittest.cc

 // Copyright 2015 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 "base/macros.h"
 #include "ui/events/event_utils.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/touch_selection/touch_selection_menu_runner.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 14 matching lines @@
 class TouchSelectionMenuRunnerViewsTest : public ViewsTestBase,
                                           public ui::TouchSelectionMenuClient {
  public:
   TouchSelectionMenuRunnerViewsTest()
       : no_command_available_(false), last_executed_command_id_(0) {}
   ~TouchSelectionMenuRunnerViewsTest() override {}
 
  protected:
   void SetUp() override {
     ViewsTestBase::SetUp();
-    // These tests expect NativeWidgetAura, force its creation.
-    // TODO(sky): the reason these end up using NativeWidgetAura is because they
-    // create a widget parented to GetContext(). GetContext() currently always
-    // returns an aura::Window in a fake WindowTreeHost. For aura-mus we should
-    // not create a fake WindowTreeHost. http://crbug.com/663561.
-    ViewsDelegate::GetInstance()->set_native_widget_factory(
-        ViewsDelegate::NativeWidgetFactory());
+    // These tests expect NativeWidgetAura and so aren't applicable to
+    // aura-mus-client. http://crbug.com/663561.
   }
 
   void set_no_commmand_available(bool no_command) {
     no_command_available_ = no_command;
   }
 
   int last_executed_command_id() const { return last_executed_command_id_; }
 
  private:
   // ui::TouchSelectionMenuClient:
@@ skipping 12 matching lines @@
   bool no_command_available_;
 
   int last_executed_command_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionMenuRunnerViewsTest);
 };
 
 // Tests that the default touch selection menu runner is installed and opening
 // and closing the menu works properly.
 TEST_F(TouchSelectionMenuRunnerViewsTest, InstalledAndWorksProperly) {
+  // See comment in SetUp().
+  if (IsAuraMusClient())
+    return;
+
   gfx::Rect menu_anchor(0, 0, 10, 10);
   gfx::Size handle_size(10, 10);
 
   // Menu runner instance should be installed, but no menu should be running.
   EXPECT_TRUE(ui::TouchSelectionMenuRunner::GetInstance());
   EXPECT_FALSE(ui::TouchSelectionMenuRunner::GetInstance()->IsRunning());
 
   // Run menu. Since commands are available, this should bring up menus.
   ui::TouchSelectionMenuRunner::GetInstance()->OpenMenu(
       this, menu_anchor, handle_size, GetContext());
   EXPECT_TRUE(ui::TouchSelectionMenuRunner::GetInstance()->IsRunning());
 
   // Close menu.
   ui::TouchSelectionMenuRunner::GetInstance()->CloseMenu();
   RunPendingMessages();
   EXPECT_FALSE(ui::TouchSelectionMenuRunner::GetInstance()->IsRunning());
 
   // Try running menu when no commands is available. Menu should not be shown.
   set_no_commmand_available(true);
   ui::TouchSelectionMenuRunner::GetInstance()->OpenMenu(
       this, menu_anchor, handle_size, GetContext());
   EXPECT_FALSE(ui::TouchSelectionMenuRunner::GetInstance()->IsRunning());
 }
 
 // Tests that anchor rect for the quick menu is adjusted correctly based on the
 // distance of handles.
 TEST_F(TouchSelectionMenuRunnerViewsTest, QuickMenuAdjustsAnchorRect) {
+  // See comment in SetUp().
+  if (IsAuraMusClient())
+    return;
+
   gfx::Size handle_size(10, 10);
   TouchSelectionMenuRunnerViews::TestApi test_api(
       static_cast<TouchSelectionMenuRunnerViews*>(
           ui::TouchSelectionMenuRunner::GetInstance()));
 
   // Calculate the width of quick menu. In addition to |kMenuCommandCount|
   // commands, there is an item for ellipsis.
   int quick_menu_width =
       (kMenuCommandCount + 1) * kMenuButtonWidth + kMenuCommandCount;
 
@@ skipping 12 matching lines @@
   ui::TouchSelectionMenuRunner::GetInstance()->OpenMenu(
       this, anchor_rect, handle_size, GetContext());
   EXPECT_EQ(anchor_rect, test_api.GetAnchorRect());
 
   ui::TouchSelectionMenuRunner::GetInstance()->CloseMenu();
   RunPendingMessages();
 }
 
 // Tests that running one of menu actions closes the menu properly.
 TEST_F(TouchSelectionMenuRunnerViewsTest, RunningActionClosesProperly) {
+  // See comment in SetUp().
+  if (IsAuraMusClient())
+    return;
+
   gfx::Rect menu_anchor(0, 0, 10, 10);
   gfx::Size handle_size(10, 10);
   TouchSelectionMenuRunnerViews::TestApi test_api(
       static_cast<TouchSelectionMenuRunnerViews*>(
           ui::TouchSelectionMenuRunner::GetInstance()));
 
   // Initially, no menu should be running.
   EXPECT_FALSE(ui::TouchSelectionMenuRunner::GetInstance()->IsRunning());
 
   // Run menu. Since commands are available, this should bring up menus.
@@ skipping 11 matching lines @@
   ui::GestureEvent tap(button_center.x(), button_center.y(), 0,
                        ui::EventTimeForNow(), details);
   button->OnGestureEvent(&tap);
   RunPendingMessages();
   EXPECT_NE(0, last_executed_command_id());
   EXPECT_FALSE(ui::TouchSelectionMenuRunner::GetInstance()->IsRunning());
 }
 
 // Tests that closing the menu widget cleans up the menu runner state properly.
 TEST_F(TouchSelectionMenuRunnerViewsTest, ClosingWidgetClosesProperly) {
+  // See comment in SetUp().
+  if (IsAuraMusClient())
+    return;
+
   gfx::Rect menu_anchor(0, 0, 10, 10);
   gfx::Size handle_size(10, 10);
   TouchSelectionMenuRunnerViews::TestApi test_api(
       static_cast<TouchSelectionMenuRunnerViews*>(
           ui::TouchSelectionMenuRunner::GetInstance()));
 
   // Initially, no menu should be running.
   EXPECT_FALSE(ui::TouchSelectionMenuRunner::GetInstance()->IsRunning());
 
   // Run menu. Since commands are available, this should bring up menus.
   ui::TouchSelectionMenuRunner::GetInstance()->OpenMenu(
       this, menu_anchor, handle_size, GetContext());
   EXPECT_TRUE(ui::TouchSelectionMenuRunner::GetInstance()->IsRunning());
 
   // Close the menu widget and check that menu runner correctly knows that menu
   // is not running anymore.
   Widget* widget = test_api.GetWidget();
   DCHECK(widget);
   widget->Close();
   RunPendingMessages();
   EXPECT_FALSE(ui::TouchSelectionMenuRunner::GetInstance()->IsRunning());
 }
 
 }  // namespace views