views/mus: Run some more tests from views_unittests in mus.

ui/views/mus/BUILD.gn

 # 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/mojo_application_manifest.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
 
+gypi = exec_script("//build/gypi_to_gn.py",
+                   [ rebase_path("../views.gyp") ],
+                   "scope",
+                   [ "../views.gyp" ])
 component("mus") {
   output_name = "ui_views_mus_lib"
 
   sources = [
     "aura_init.cc",
     "aura_init.h",
     "display_list.cc",
     "display_list.h",
     "input_method_mus.cc",
     "input_method_mus.h",
@@ skipping 97 matching lines @@
   public_deps = [
     ":mus",
   ]
 }
 
 source_set("test_support") {
   testonly = true
 
   sources = [
     "../test/native_widget_factory_mus.cc",
-    "../views_test_suite.cc",
-    "../views_test_suite.h",
     "views_mus_test_suite.cc",
     "views_mus_test_suite.h",
   ]
 
   deps = [
     ":mus",
     "//base",
     "//base/test:test_support",
     "//components/mus/common:mus_common",
     "//services/shell/background:lib",
@@ skipping 11 matching lines @@
   data_deps = [
     "//ui/resources:ui_test_pak_data",
   ]
 }
 
 test("views_mus_unittests") {
   testonly = true
 
   configs += [ "//build/config:precompiled_headers" ]
 
-  # TODO(sky): add more files.
   sources = [
-    "../controls/native/native_view_host_aura_unittest.cc",
-    "../controls/native/native_view_host_test_base.cc",
-    "../controls/native/native_view_host_test_base.h",
-    "../controls/native/native_view_host_unittest.cc",
-    "../view_targeter_unittest.cc",
-    "../widget/native_widget_aura_unittest.cc",
-    "../widget/native_widget_unittest.cc",
-    "../widget/widget_unittest.cc",
     "display_list_unittest.cc",
     "native_widget_mus_unittest.cc",
     "run_all_unittests_mus.cc",
     "screen_mus_unittest.cc",
     "window_manager_connection_unittest.cc",
   ]
 
+  sources += rebase_path(gypi.views_unittests_sources, ".", "//ui/views")
+  sources += rebase_path(gypi.views_unittests_aura_sources, ".", "//ui/views")
+
+  sources -= [
+    # Mus has its own runner.
+    "../run_all_unittests_main.cc",
+
+    # EventGenerator doesn't work well with IME in mus.
+    # crbug.com/615033 crbug.com/548407
+    "../controls/textfield/textfield_unittest.cc",
+
+    # Tooltips. crbug.com/599558
+    "../corewm/tooltip_controller_unittest.cc",
+
+    # Some of the tests need drag-drop support. crbug.com/614037
+    "../touchui/touch_selection_controller_impl_unittest.cc",
+  ]
+
   deps = [
     ":mus",
     ":test_support",
     "//base",
     "//base:i18n",
+    "//base/test:test_support",
     "//cc",
     "//components/mus/public/cpp",
     "//components/mus/public/cpp/tests:unittest_support",
     "//components/mus/public/interfaces",
     "//services/shell/background:main",  # Provides main().
     "//skia",
     "//testing/gtest",
     "//third_party/icu",
     "//ui/accessibility",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base",
     "//ui/base:test_support",
     "//ui/base/ime",
     "//ui/compositor:test_support",
     "//ui/events:dom_keycode_converter",
     "//ui/events:events_base",
     "//ui/events:test_support",
     "//ui/events/platform",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
+    "//ui/native_theme",
     "//ui/strings",
+    "//ui/touch_selection",
     "//ui/views",
     "//ui/views:test_support_internal",
     "//ui/wm",
     "//url",
   ]
 
   data_deps = [
     ":unittests_manifest",
     "//components/mus/test_wm",
   ]
@@ skipping 82 matching lines @@
   type = "exe"
   application_name = "views_mus_interactive_ui_tests"
   source = "interactive_ui_tests_manifest.json"
 }
 
 group("for_component") {
   public_deps = [
     ":mus",
   ]
 }