Fixes and test updates for aura-mus

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 12 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 it's creation.

[msw, 2016/11/08 23:38:27]

nit: "its"

[sky, 2016/11/09 00:06:01]

Done.

+    // TODO(sky): the reason these end up using NativeWidgetAura is because they

[msw, 2016/11/08 23:38:27]

optional nit: cite a bug?

[sky, 2016/11/09 00:06:01]

Done.

+    // 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.
+    ViewsDelegate::GetInstance()->set_native_widget_factory(
+        ViewsDelegate::NativeWidgetFactory());
+  }
+
   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:
   bool IsCommandIdEnabled(int command_id) const override {
     return !no_command_available_;
@@ skipping 124 matching lines @@
   // 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