Update skia and ui GN builds

ui/base/BUILD.gn

Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index a1bee60e45fd87e9c273c5abb9ac93bcf8eb382a..a7029aa6697834773419e13774b140a6f8390801 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -195,11 +195,7 @@ component("base") {
     "text/bytes_formatting.h",
     "theme_provider.cc",
     "theme_provider.h",
-    "touch/touch_device.cc",
     "touch/touch_device.h",
-    "touch/touch_device_android.cc",
-    "touch/touch_device_ozone.cc",
-    "touch/touch_device_win.cc",
     "touch/touch_editing_controller.cc",
     "touch/touch_editing_controller.h",
     "touch/touch_enabled.cc",
@@ -259,6 +255,19 @@ component("base") {
     "x/x11_util_internal.h",
   ]
 
+  if (is_win) {
+    sources += [ "touch/touch_device_win.cc" ]

[tfarina, 2014/05/30 20:17:23]

not that I don't like this. I like it, it seems cleaner. But the question and
thus the need for an answer still stands.

+  } else if (is_android) {
+    sources += [ "touch/touch_device_android.cc" ]
+  } else if (use_ozone) {
+    sources += [ "touch/touch_device_ozone.cc" ]
+  } else if (use_aura && use_x11) { 
+    sources += [ "touch/touch_device_aurax11.cc" ]
+  } else {
+    # Empty implementation for all other cases.
+    sources += [ "touch/touch_device.cc" ]
+  }
+
   defines = [ "UI_BASE_IMPLEMENTATION" ]
 
   deps = [
@@ -319,12 +328,6 @@ component("base") {
     ]
   }
 
-  if (!use_ozone) {
-    sources -= [
-      "touch/touch_device_ozone.cc",

[tfarina, 2014/05/30 20:17:23]

we shouldn't have to do this, if we had an exclusion rule for use_ozone.

[brettw, 2014/05/30 20:34:46]

I don't think we should have inclusion rules for uze_ozone, aurax11, etc. The
GYP filename rules are out of control (there's one for ozone DRM which affects 5
files in the entire tree, which requires us to apply two nontrivial regular
expressions to every source file encountered in the build.

So the policy I outlined in BUILDCONFIG is that the filtering is for toplevel
platforms only (linux, mac, etc.) There are only 34 _ozone.cc files so it really
isn't a big deal.

-    ]
-  }
-
   if (!use_aura || !is_linux) {
     sources -= [
       "resource/resource_bundle_auralinux.cc",
@@ -364,9 +367,6 @@ component("base") {
       "dragdrop/os_exchange_data_provider_aura.cc",
       "dragdrop/os_exchange_data_provider_aura.h",
     ]
-    sources -= [
-      "touch/touch_device.cc",
-    ]
   }
 
   libs = []
@@ -374,9 +374,6 @@ component("base") {
     deps += [
       "//third_party/wtl",
     ]
-    sources -= [
-      "touch/touch_device.cc",
-    ]
     cflags = [
       "/wd4267",  # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int.
       "/wd4324",  # Structure was padded due to __declspec(align()), which is
@@ -440,7 +437,6 @@ component("base") {
         "cursor/cursor_loader_x11.cc",
         "cursor/cursor_loader_x11.h",
         "cursor/cursor_x11.cc",
-        "touch/touch_device_aurax11.cc",

[tfarina, 2014/05/30 20:17:23]

same here.

       ]
       if (!is_chromeos) {
         # These Aura X11 files aren't used on ChromeOS.
@@ -473,7 +469,6 @@ component("base") {
       "models/button_menu_item_model.cc",
       "models/dialog_model.cc",
       "theme_provider.cc",
-      "touch/touch_device.cc",
       "touch/touch_editing_controller.cc",
       "ui_base_types.cc",
     ]