Revert "Remote assistance on Chrome OS Part VIII - Compile on Ozone"

remoting/remoting_host.gypi

Index: remoting/remoting_host.gypi
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index efe36d11484fd638a4971a6c6fa1d7c36443df83..08d6639fa680b40661cfb5405288991efcfe4236 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -21,8 +21,7 @@
         'enable_it2me_host': 0,
         'enable_remoting_host': 0,
       }],
-      ['chromeos==1', {
-        'enable_remoting_host': 1,
+      ['chromeos==1 and use_x11==1', {
         'enable_me2me_host': 0,
         'enable_it2me_host': 1,
       }],
@@ -61,23 +60,13 @@
           ],
           'conditions': [
             ['OS=="linux"', {
-              'conditions': [
-                ['use_x11==1', {
-                  'dependencies': [
-                    '../build/linux/system.gyp:x11',
-                    '../build/linux/system.gyp:xext',
-                    '../build/linux/system.gyp:xfixes',
-                    '../build/linux/system.gyp:xi',
-                    '../build/linux/system.gyp:xrandr',
-                    '../build/linux/system.gyp:xtst',
-                  ],
-                }],
-                ['chromeos==0 and use_ozone==0', {
-                  'dependencies': [
-                    # use GTK on Linux, even for Aura builds.
-                    '../build/linux/system.gyp:gtk',
-                  ],
-                }]
+              'dependencies': [
+                '../build/linux/system.gyp:x11',
+                '../build/linux/system.gyp:xext',
+                '../build/linux/system.gyp:xfixes',
+                '../build/linux/system.gyp:xi',
+                '../build/linux/system.gyp:xrandr',
+                '../build/linux/system.gyp:xtst',
               ],
               'link_settings': {
                 'libraries': [
@@ -85,6 +74,12 @@
                 ],
               },
             }],
+            ['OS=="linux" and chromeos==0 and use_ozone==0', {
+              'dependencies' : [
+                # Always use GTK on Linux, even for Aura builds.
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
             ['chromeos==1', {
               'dependencies' : [
                 '../cc/cc.gyp:cc',
@@ -95,7 +90,6 @@
                 '../ui/aura/aura.gyp:aura',
                 '../ui/compositor/compositor.gyp:compositor',
                 '../ui/events/events.gyp:events',
-                '../ui/events/platform/events_platform.gyp:events_platform',
                 '../ui/views/views.gyp:views',
               ],
               'include_dirs': [
@@ -105,22 +99,21 @@
                 'host/clipboard_x11.cc',
                 'host/continue_window_linux.cc',
                 'host/disconnect_window_linux.cc',
-                'host/linux/x_server_clipboard.cc',
-                'host/linux/x_server_clipboard.h',
                 'host/policy_hack/policy_watcher_linux.cc',
                 'host/remoting_me2me_host.cc',
-              ],
-              'conditions': [
-                ['use_ozone==0', {
-                  'sources!': [
-                    'host/input_injector_chromeos.cc',
-                    'host/input_injector_chromeos.h',
-                    'host/local_input_monitor_chromeos.cc',
-                    'host/chromeos/mouse_cursor_monitor_aura.cc',
-                    'host/chromeos/mouse_cursor_monitor_aura.h',
-                  ],
-                }],
-              ],
+              ]
+            }, {  # chromeos==0
+               'sources!' : [
+                 'host/chromeos/aura_desktop_capturer.cc',
+                 'host/chromeos/aura_desktop_capturer.h',
+                 'host/chromeos/message_box.cc',
+                 'host/chromeos/message_box.h',
+                 'host/clipboard_aura.cc',
+                 'host/clipboard_aura.h',
+                 'host/continue_window_chromeos.cc',
+                 'host/disconnect_window_chromeos.cc',
+                 'host/policy_hack/policy_watcher_chromeos.cc',
+               ],
             }],
             ['OS=="mac"', {
               'dependencies': [