Cleanup after removing views-mus code

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("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
 
 component("mus") {
   output_name = "ui_views_mus_lib"
 
   sources = [
     "aura_init.cc",
     "aura_init.h",
     "clipboard_mus.cc",
     "clipboard_mus.h",
     "desktop_window_tree_host_mus.cc",
     "desktop_window_tree_host_mus.h",
     "mus_client.cc",
     "mus_client.h",
     "mus_client_observer.h",
     "mus_export.h",
-    "pointer_watcher_event_router2.cc",
-    "pointer_watcher_event_router2.h",
+    "pointer_watcher_event_router.cc",
+    "pointer_watcher_event_router.h",
     "screen_mus.cc",
     "screen_mus.h",
     "screen_mus_delegate.h",
     "window_manager_constants_converters.cc",
     "window_manager_constants_converters.h",
     "window_manager_frame_values.cc",
     "window_manager_frame_values.h",
   ]
 
   defines = [ "VIEWS_MUS_IMPLEMENTATION" ]
@@ skipping 68 matching lines @@
     ":mus",
   ]
 }
 
 static_library("test_support") {
   testonly = true
 
   sources = [
     "../test/native_widget_factory_aura_mus.cc",
     "test_utils.h",
-    "views_aura_mus_test_suite.cc",
-    "views_aura_mus_test_suite.h",
+    "views_mus_test_suite.cc",
+    "views_mus_test_suite.h",
   ]
 
   deps = [
     ":mus",
     "//base",
     "//base/test:test_support",
     "//services/service_manager/background:lib",
     "//services/service_manager/public/cpp:sources",
     "//services/ui/common:mus_common",
     "//testing/gtest",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/gl:test_support",
     "//ui/resources",
     "//ui/resources:ui_test_pak",
     "//ui/views",
     "//ui/views:test_support_internal",
   ]
 
   data_deps = [
     "//ui/resources:ui_test_pak_data",
   ]
 }
 
 test("views_mus_unittests") {
   testonly = true
 
   sources = [
     "desktop_window_tree_host_mus_unittest.cc",
-    "pointer_watcher_event_router2_unittest.cc",
-    "run_all_unittests_aura_mus.cc",
+    "pointer_watcher_event_router_unittest.cc",
+    "run_all_unittests_mus.cc",
     "screen_mus_unittest.cc",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
 
   deps = [
     ":mus",
     ":test_support",
     "//base",
     "//base:i18n",
@@ skipping 111 matching lines @@
 
 service_manifest("unittests_manifest") {
   name = "views_mus_unittests"
   source = "unittests_manifest.json"
 }
 
 service_manifest("interactive_ui_tests_manifest") {
   name = "views_mus_interactive_ui_tests"
   source = "interactive_ui_tests_manifest.json"
 }