Unified touch_device_aurax11 and touch_device_ozone.

ui/base/ui_base.gyp

Index: ui/base/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 1c8af2cb55710ee7604d1693bff1ecede13f6696..57d25f93ed139b133d4ac41a90b5660a35a008c9 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -352,8 +352,7 @@
         'touch/touch_device.cc',
         'touch/touch_device.h',
         'touch/touch_device_android.cc',
-        'touch/touch_device_aurax11.cc',
-        'touch/touch_device_ozone.cc',
+        'touch/touch_device_linux.cc',
         'touch/touch_device_win.cc',
         'touch/touch_editing_controller.cc',
         'touch/touch_editing_controller.h',
@@ -530,13 +529,20 @@
         ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
           'sources!': [
             'dragdrop/os_exchange_data_provider_aurax11.cc',
-            'touch/touch_device.cc',
           ],
         }, {
           'sources!': [
             'dragdrop/os_exchange_data_provider_aura.cc',
             'dragdrop/os_exchange_data_provider_aura.h',
-            'touch/touch_device_aurax11.cc',
+          ],
+        }],
+        ['chromeos==1 or OS=="linux"', {

[sadrul, 2015/01/20 18:44:08]

I think you can use just 'OS=="linux"' here.

[mustaq, 2015/01/21 17:07:35]

Done.

+          'sources!': [
+            'touch/touch_device.cc',
+          ],
+        }, {
+          'sources!': [
+            'touch/touch_device_linux.cc',
           ],
         }],
         ['OS=="win"', {
@@ -573,7 +579,7 @@
               '-loleacc.lib',
             ],
           },
-        },{  # OS!="win"
+        }, {  # OS!="win"
           'conditions': [
             ['use_aura==0', {
               'sources!': [