Remove some code inside USE_AURA and OS_WIN ifdefs.

content/content_browser.gypi

Index: content/content_browser.gypi
===================================================================
--- content/content_browser.gypi	(revision 244508)
+++ content/content_browser.gypi	(working copy)
@@ -1061,8 +1061,6 @@
     'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm',
     'browser/renderer_host/render_widget_host_view_mac.h',
     'browser/renderer_host/render_widget_host_view_mac.mm',
-    'browser/renderer_host/render_widget_host_view_win.cc',
-    'browser/renderer_host/render_widget_host_view_win.h',
     'browser/renderer_host/renderer_frame_manager.cc',
     'browser/renderer_host/renderer_frame_manager.h',
     'browser/renderer_host/software_frame_manager.cc',
@@ -1218,8 +1216,6 @@
     'browser/web_contents/touch_editable_impl_aura.h',
     'browser/web_contents/web_contents_android.cc',
     'browser/web_contents/web_contents_android.h',
-    'browser/web_contents/web_contents_drag_win.cc',
-    'browser/web_contents/web_contents_drag_win.h',
     'browser/web_contents/web_contents_impl.cc',
     'browser/web_contents/web_contents_impl.h',
     'browser/web_contents/web_contents_view_android.cc',
@@ -1232,20 +1228,14 @@
     'browser/web_contents/web_contents_view_guest.h',
     'browser/web_contents/web_contents_view_mac.h',
     'browser/web_contents/web_contents_view_mac.mm',
-    'browser/web_contents/web_contents_view_win.cc',
-    'browser/web_contents/web_contents_view_win.h',
     'browser/web_contents/web_drag_dest_gtk.cc',
     'browser/web_contents/web_drag_dest_gtk.h',
     'browser/web_contents/web_drag_dest_mac.h',
     'browser/web_contents/web_drag_dest_mac.mm',
-    'browser/web_contents/web_drag_dest_win.cc',
-    'browser/web_contents/web_drag_dest_win.h',
     'browser/web_contents/web_drag_source_gtk.cc',
     'browser/web_contents/web_drag_source_gtk.h',
     'browser/web_contents/web_drag_source_mac.h',
     'browser/web_contents/web_drag_source_mac.mm',
-    'browser/web_contents/web_drag_source_win.cc',
-    'browser/web_contents/web_drag_source_win.h',
     'browser/web_contents/web_drag_utils_win.cc',
     'browser/web_contents/web_drag_utils_win.h',
     'browser/webui/content_web_ui_controller_factory.cc',
@@ -1557,14 +1547,8 @@
         ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],
       ],
     }],
-    ['use_aura!=1 and OS!="win"', {
+    ['use_aura!=1 and OS!="android"', {
       'sources!': [
-        'browser/renderer_host/ui_events_helper.cc',
-        'browser/renderer_host/ui_events_helper.h',
-      ],
-    }],
-    ['use_aura!=1 and OS!="win" and OS!="android"', {
-      'sources!': [
         'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc',
         'browser/renderer_host/tap_suppression_controller.cc',
       ],
@@ -1584,17 +1568,6 @@
         ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
         ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller.cc'],
         ['exclude', '^browser/renderer_host/native_web_keyboard_event_win.cc'],
-        ['exclude', '^browser/renderer_host/render_widget_host.h'],
-        ['exclude', '^browser/renderer_host/render_widget_host_view_win.cc'],
-        ['exclude', '^browser/renderer_host/render_widget_host_view_win.h'],
-        ['exclude', '^browser/web_contents/web_contents_drag_win.cc'],
-        ['exclude', '^browser/web_contents/web_contents_drag_win.h'],
-        ['exclude', '^browser/web_contents/web_contents_view_win.cc'],
-        ['exclude', '^browser/web_contents/web_contents_view_win.h'],
-        ['exclude', '^browser/web_contents/web_drag_dest_win.cc'],
-        ['exclude', '^browser/web_contents/web_drag_dest_win.h'],
-        ['exclude', '^browser/web_contents/web_drag_source_win.cc'],
-        ['exclude', '^browser/web_contents/web_drag_source_win.h'],
       ],
     }, {
       'sources/': [
@@ -1604,6 +1577,8 @@
         ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'],
         ['exclude', '^browser/web_contents/touch_editable_impl_aura.cc'],
         ['exclude', '^browser/web_contents/touch_editable_impl_aura.h'],
+        ['exclude', '^browser/renderer_host/ui_events_helper.cc'],
+        ['exclude', '^browser/renderer_host/ui_events_helper.h'],
       ],
     }],
     ['enable_plugins==1', {