More delete + gfx_unittests

ui/base/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/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 component("base") {
   output_name = "ui_base"
   sources = [
     "android/system_ui_resource_manager.h",
     "android/ui_base_jni_registrar.cc",
     "android/ui_base_jni_registrar.h",
     "android/view_android.cc",
     "android/view_android.h",
     "android/window_android.cc",
     "android/window_android.h",
     "android/window_android_compositor.h",
     "android/window_android_observer.h",
     "cursor/cursor.h",
     "hit_test.h",
-    "touch/touch_device.h",
-    "touch/touch_enabled.cc",
-    "touch/touch_enabled.h",
     "ui_base_export.h",
-    "ui_base_paths.cc",
-    "ui_base_paths.h",
     "ui_base_switches.cc",
     "ui_base_switches.h",
-    "ui_base_switches_util.cc",
-    "ui_base_switches_util.h",
-    "ui_base_types.cc",
-    "ui_base_types.h",
     "view_prop.cc",
     "view_prop.h",
     "win/accessibility_ids_win.h",
     "win/accessibility_misc_utils.cc",
     "win/accessibility_misc_utils.h",
     "win/atl_module.h",
     "win/foreground_helper.cc",
     "win/foreground_helper.h",
     "win/hidden_window.cc",
     "win/hidden_window.h",
@@ skipping 12 matching lines @@
     "win/scoped_ole_initializer.cc",
     "win/scoped_ole_initializer.h",
     "win/shell.cc",
     "win/shell.h",
     "win/touch_input.cc",
     "win/touch_input.h",
     "win/window_event_target.cc",
     "win/window_event_target.h",
   ]
 
-  if (is_win) {
-    sources += [ "touch/touch_device_win.cc" ]
-  } else if (is_android) {
-    sources += [ "touch/touch_device_android.cc" ]
-  } else if (use_x11) {
-    sources += [ "touch/touch_device_x11.cc" ]
-  } else {
-    # Empty implementation for all other cases.
-    sources += [ "touch/touch_device.cc" ]
-  }
-
   defines = [ "UI_BASE_IMPLEMENTATION" ]
 
   public_deps = [
     "//base",
     "//skia",
     "//ui/events",
     "//ui/events/platform",
     "//ui/events:events_base",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
   deps = [
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
     "//base:i18n",
     "//net",
     "//third_party/icu",
     "//url",
   ]
 
   if (use_x11) {
     sources += [
-      "x/x11_foreign_window_manager.cc",
-      "x/x11_foreign_window_manager.h",
-      "x/x11_menu_list.cc",
-      "x/x11_menu_list.h",
       "x/x11_util.cc",
       "x/x11_util.h",
       "x/x11_util_internal.h",
     ]
     deps += [ "//ui/gfx/x" ]
   }
 
   if (is_linux) {
     configs += [
       "//build/config/linux:fontconfig",
@@ skipping 42 matching lines @@
   if (use_x11) {
     #'all_dependent_settings': {
     #'ldflags': [
     #'-L<(PRODUCT_DIR)',
     #],
     #},
     configs += [ "//build/config/linux:x11" ]
   }
 
   if (is_android) {
-    sources -= [ "ui_base_types.cc" ]
-
     deps += [ ":ui_base_jni_headers" ]
 
     libs += [ "jnigraphics" ]
   }
 
   if (is_android && is_android_webview_build) {
     deps += [
       #TODO(GYP): port this component to GN.
       #"//ui/android:ui_java",
     ]
   }
 }
 
 if (is_android) {
   generate_jni("ui_base_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java",
       "../android/java/src/org/chromium/ui/base/SelectFileDialog.java",
-      "../android/java/src/org/chromium/ui/base/TouchDevice.java",
       "../android/java/src/org/chromium/ui/base/ViewAndroid.java",
       "../android/java/src/org/chromium/ui/base/WindowAndroid.java",
     ]
     jni_package = "base"
   }
 }
 
 if (false) {
   # TODO(GYP): Make this work on Android and reenable it.
   if (!is_android) {
     # TODO(tfarina): Rename this target to ui_base_unittests.
     # In order to do this we will need to keep this target, add a dummy
     # ui_base_unittests target that just points to ui_unittests, change
     # buildbot code to reference the new 'ui_base_unittests' target.
     # After buildbot is updated, we can make the changes in Chromium and
     # remove 'ui_unittests' target. crbug.com/331829
     test("ui_unittests") {
       sources = [
-        "layout_unittest.cc",
         "test/run_all_unittests.cc",
       ]
 
       sources += [
-        "accelerators/accelerator_manager_unittest.cc",
-        "accelerators/menu_label_accelerator_util_linux_unittest.cc",
         "test/data/resource.h",
         "view_prop_unittest.cc",
       ]
 
       deps = [
         "//base",
         "//base/allocator",
         "//base/test:test_support",
         "//net",
         "//skia",
@@ skipping 64 matching lines @@
           "//chromeos",
           "//ui/aura:test_support",
           "//ui/events:gesture_detection",
           "//ui/chromeos:ui_chromeos",
         ]
       }
     }
   }
 }
 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk).