Update skia and ui GN builds

ui/events/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")
 
 static_library("dom4_keycode_converter") {
   sources = [
     "keycodes/dom4/keycode_converter.cc",
     "keycodes/dom4/keycode_converter.h",
     "keycodes/dom4/keycode_converter_data.h",
   ]
 
   deps = [ "//base" ]
 }
 
 component("events_base") {
   sources = [
     "event_constants.h",
     "event_switches.cc",
     "event_switches.h",
     "events_base_export.h",
     "gesture_event_details.cc",
     "gesture_event_details.h",
+    "gestures/gesture_configuration.cc",
+    "gestures/gesture_configuration.h",
     "keycodes/keyboard_code_conversion.cc",
     "keycodes/keyboard_code_conversion.h",
     "keycodes/keyboard_code_conversion_android.cc",
     "keycodes/keyboard_code_conversion_android.h",
     "keycodes/keyboard_code_conversion_mac.h",
     "keycodes/keyboard_code_conversion_mac.mm",
     "keycodes/keyboard_code_conversion_win.cc",
     "keycodes/keyboard_code_conversion_win.h",
     "keycodes/keyboard_codes.h",
     "latency_info.cc",
@@ skipping 24 matching lines @@
       "x/touch_factory_x11.cc",
       "x/touch_factory_x11.h",
     ]
   }
 }
 
 component("events") {
   deps = [
     ":dom4_keycode_converter",
     ":events_base",
+    ":gesture_detection",
     "//skia",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
   defines = [ "EVENTS_IMPLEMENTATION" ]
 
   sources = [
     "cocoa/cocoa_event_utils.h",
     "cocoa/cocoa_event_utils.mm",
@@ skipping 10 matching lines @@
     "event_source.h",
     "event_target.cc",
     "event_target.h",
     "event_target_iterator.h",
     "event_targeter.cc",
     "event_targeter.h",
     "event_utils.cc",
     "event_utils.h",
     "events_export.h",
     "events_stub.cc",
-    "gestures/gesture_configuration.cc",
-    "gestures/gesture_configuration.h",
     "gestures/gesture_point.cc",
     "gestures/gesture_point.h",
     "gestures/gesture_recognizer.h",
     "gestures/gesture_recognizer_impl.cc",
     "gestures/gesture_recognizer_impl.h",
+    "gestures/gesture_recognizer_impl_mac.cc",
     "gestures/gesture_sequence.cc",
     "gestures/gesture_sequence.h",
     "gestures/gesture_types.h",
     "gestures/velocity_calculator.cc",
     "gestures/velocity_calculator.h",
     "platform/platform_event_dispatcher.h",
     "platform/platform_event_observer.h",
     "platform/platform_event_source.cc",
     "platform/platform_event_source.h",
     "platform/platform_event_source_stub.cc",
@@ skipping 45 matching lines @@
       "ozone/evdev/key_event_converter_evdev.cc",
       "ozone/evdev/key_event_converter_evdev.h",
       "ozone/evdev/touch_event_converter_evdev.cc",
       "ozone/evdev/touch_event_converter_evdev.h",
       "ozone/event_factory_ozone.cc",
       "ozone/event_factory_ozone.h",
       "ozone/events_ozone.cc",
     ]
   }
 
+  if (use_aura) {
+    sources += [
+      "gestures/gesture_provider_aura.cc",
+      "gestures/gesture_provider_aura.h",
+      "gestures/motion_event_aura.cc",
+      "gestures/motion_event_aura.h",
+    ]
+  }
+
   if (is_win || use_x11 || use_ozone) {
     sources -= [ "events_stub.cc" ]
   }
 }
 
 component("gesture_detection") {
   sources = [
     "gesture_detection/bitset_32.h",
     "gesture_detection/filtered_gesture_provider.cc",
     "gesture_detection/filtered_gesture_provider.h",
@@ skipping 22 matching lines @@
 
   deps = [
     ":events_base",
     "//base",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
   defines = [ "GESTURE_DETECTION_IMPLEMENTATION" ]
 
-  if (use_aura) {
-    deps += [ ":events" ]
-  }
-
   if (is_android) {
     sources += [ "gesture_detection/gesture_config_helper_android.cc" ]
   } else if (use_aura) {
     sources += [ "gesture_detection/gesture_config_helper_aura.cc" ]
   } else {
     sources += [ "gesture_detection/gesture_config_helper.cc" ]
   }
 }
 
 source_set("events_test_support") {
@@ skipping 75 matching lines @@
     ":events_base",
     ":events_test_support",
     ":gesture_detection",
     "//base",
     "//base/test:run_all_unittests",
     "//skia",
     "//testing/gtest",
     "//ui/gfx:gfx_test_support",
   ]
 }