Fix remoting_unittests compilation with aura

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 9651831079ef292dc494a046bc331f7a0f94c645..b54b3f4d5341ee67f1b958d3c256c97f55c5bf25 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -871,10 +871,6 @@
         'host/branding.cc',
         'host/branding.h',
         'host/host_ui_resource.h',
-        'host/host_user_interface.cc',
-        'host/host_user_interface.h',
-        'host/it2me_host_user_interface.cc',
-        'host/it2me_host_user_interface.h',
         'host/plugin/daemon_controller.h',
         'host/plugin/daemon_controller_linux.cc',
         'host/plugin/daemon_controller_mac.cc',
@@ -1131,8 +1127,8 @@
         'host/clipboard_win.cc',
         'host/constants.h',
         'host/continue_window.h',
+        'host/continue_window_gtk.cc',
         'host/continue_window_mac.mm',
-        'host/continue_window_linux.cc',
         'host/continue_window_win.cc',
         'host/curtain.h',
         'host/curtain_linux.cc',
@@ -1142,10 +1138,10 @@
         'host/desktop_environment.h',
         'host/desktop_win.cc',
         'host/desktop_win.h',
-        'host/differ.h',
         'host/differ.cc',
+        'host/differ.h',
         'host/disconnect_window.h',
-        'host/disconnect_window_linux.cc',
+        'host/disconnect_window_gtk.cc',
         'host/disconnect_window_mac.h',
         'host/disconnect_window_mac.mm',
         'host/disconnect_window_win.cc',
@@ -1166,8 +1162,12 @@
         'host/host_secret.cc',
         'host/host_secret.h',
         'host/host_status_observer.h',
+        'host/host_user_interface.cc',
+        'host/host_user_interface.h',
         'host/in_memory_host_config.cc',
         'host/in_memory_host_config.h',
+        'host/it2me_host_user_interface.cc',
+        'host/it2me_host_user_interface.h',
         'host/json_host_config.cc',
         'host/json_host_config.h',
         'host/local_input_monitor.h',
@@ -1217,7 +1217,7 @@
         'host/vlog_net_log.h',
       ],
       'conditions': [
-        ['toolkit_uses_gtk == 1', {
+        ['OS=="linux" and chromeos==0', {

[Wez, 2012/05/16 22:28:32]

nit: Add a comment explaining this combination; given this looks to be
GTK-related, why are we changing it to be CrOS-dependent?

[Sergey Ulanov, 2012/05/16 23:00:07]

This condition enables compilation of XServerPixelBuffer which is not related to
GTK in any way. In this same time it adds GTK dependency.
Updated it to split into two conditions, one for GTK and one for X11 (OS=linux).

           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
@@ -1236,6 +1236,11 @@
             ],
           },
         }],
+        ['toolkit_uses_gtk!=1', {
+          'sources!': [
+            '*_gtk.cc',
+          ],
+        }],
         ['OS=="mac"', {
           'sources': [
             '../third_party/GTM/AppKit/GTMCarbonEvent.h',
@@ -1309,18 +1314,6 @@
         '../media/media.gyp:media',
       ],
       'sources': [
-        'host/continue_window.h',
-        'host/continue_window_mac.mm',
-        'host/continue_window_linux.cc',
-        'host/continue_window_win.cc',
-        'host/disconnect_window_linux.cc',
-        'host/disconnect_window_mac.h',
-        'host/disconnect_window_mac.mm',
-        'host/disconnect_window_win.cc',
-        'host/host_user_interface.cc',
-        'host/host_user_interface.h',
-        'host/it2me_host_user_interface.cc',
-        'host/it2me_host_user_interface.h',
         'host/simple_host_process.cc',
       ],
       'conditions': [
@@ -1348,8 +1341,6 @@
         'host/branding.cc',
         'host/branding.h',
         'host/host_event_logger.h',
-        'host/host_user_interface.cc',
-        'host/host_user_interface.h',
         'host/sighup_listener_mac.cc',
         'host/sighup_listener_mac.h',
         'host/remoting_me2me_host.cc',
@@ -1699,10 +1690,6 @@
         'host/host_key_pair_unittest.cc',
         'host/host_mock_objects.cc',
         'host/host_mock_objects.h',
-        'host/host_user_interface.cc',
-        'host/host_user_interface.h',
-        'host/it2me_host_user_interface.cc',
-        'host/it2me_host_user_interface.h',
         'host/json_host_config_unittest.cc',
         'host/log_to_server_unittest.cc',
         'host/pin_hash_unittest.cc',