Update CRD ChromeOS Host build files to be better in line with GN style.

remoting/host/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/util/process_version.gni")
 import("//remoting/build/config/remoting_build.gni")
 
 group("all_tests") {
   testonly = true
 
@@ skipping 51 matching lines @@
     "audio_capturer_win.cc",
     "audio_capturer_win.h",
     "audio_silence_detector.cc",
     "audio_silence_detector.h",
     "backoff_timer.cc",
     "backoff_timer.h",
     "basic_desktop_environment.cc",
     "basic_desktop_environment.h",
     "branding.cc",
     "branding.h",
-    "chromeos/aura_desktop_capturer.cc",
-    "chromeos/aura_desktop_capturer.h",
-    "chromeos/clipboard_aura.cc",
-    "chromeos/clipboard_aura.h",
-    "chromeos/message_box.cc",
-    "chromeos/message_box.h",
-    "chromeos/mouse_cursor_monitor_aura.cc",
-    "chromeos/mouse_cursor_monitor_aura.h",
-    "chromeos/point_transformer.cc",
-    "chromeos/point_transformer.h",
-    "chromeos/skia_bitmap_desktop_frame.cc",
-    "chromeos/skia_bitmap_desktop_frame.h",
     "chromoting_host.cc",
     "chromoting_host.h",
     "chromoting_host_context.cc",
     "chromoting_host_context.h",
     "chromoting_messages.cc",
     "chromoting_messages.h",
     "chromoting_param_traits.cc",
     "chromoting_param_traits.h",
     "client_session.cc",
     "client_session.h",
@@ skipping 104 matching lines @@
     "ipc_mouse_cursor_monitor.cc",
     "ipc_mouse_cursor_monitor.h",
     "ipc_screen_controls.cc",
     "ipc_screen_controls.h",
     "ipc_util.h",
     "ipc_util_win.cc",
     "ipc_video_frame_capturer.cc",
     "ipc_video_frame_capturer.h",
     "it2me_desktop_environment.cc",
     "it2me_desktop_environment.h",
-    "linux/audio_pipe_reader.cc",
-    "linux/audio_pipe_reader.h",
-    "linux/certificate_watcher.cc",
-    "linux/certificate_watcher.h",
-    "linux/unicode_to_keysym.cc",
-    "linux/unicode_to_keysym.h",
-    "linux/x11_character_injector.cc",
-    "linux/x11_character_injector.h",
-    "linux/x11_keyboard_impl.cc",
-    "linux/x11_keyboard_impl.h",
-    "linux/x11_util.cc",
-    "linux/x11_util.h",
-    "linux/x_server_clipboard.cc",
-    "linux/x_server_clipboard.h",
     "local_input_monitor.h",
     "local_input_monitor_chromeos.cc",
     "local_input_monitor_mac.mm",
     "local_input_monitor_win.cc",
     "local_input_monitor_x11.cc",
     "logging.h",
     "logging_linux.cc",
     "logging_mac.cc",
     "logging_win.cc",
     "me2me_desktop_environment.cc",
@@ skipping 89 matching lines @@
     "//ui/events:dom_keycode_converter",
     "//ui/events/platform",
   ]
 
   public_deps = []
 
   if (enable_configuration_policy) {
     deps += [ "//components/policy:generated" ]
   }
 
-  if (is_linux && !is_chromeos) {
-    libs += [ "pam" ]
+  if (is_linux) {
+    public_deps += [ "//remoting/host/linux" ]

[Sergey Ulanov, 2016/11/23 22:35:30]

I don't think we need any of these files on ChromeOS, so maybe move it to
!is_chromeos

[nicholss, 2017/04/24 18:01:03]

Done.

+    if (!is_chromeos) {
+      libs += [ "pam" ]
+    }
   }
 
   if (use_x11) {
     configs += [
       "//build/config/linux:x11",
       "//build/config/linux:xrandr",
     ]
-    if (is_desktop_linux) {
-      if (use_gtk3) {
-        deps += [ "//build/config/linux/gtk3" ]
-      } else {
-        deps += [ "//build/config/linux/gtk2" ]
-      }
-    }
   } else {
     sources -= [
       "clipboard_x11.cc",
       "desktop_resizer_x11.cc",
       "input_injector_x11.cc",
       "local_input_monitor_x11.cc",
     ]
-    if (is_linux) {
-      # These will already be filtered out on non-Linux.
-      sources -= [
-        "linux/unicode_to_keysym.cc",
-        "linux/x11_keyboard_impl.cc",
-        "linux/x11_keyboard_impl.h",
-        "linux/x11_util.cc",
-        "linux/x_server_clipboard.cc",
-        "linux/x_server_clipboard.h",
-      ]
-    }
   }
 
   if (!use_ozone) {
     sources -= [ "desktop_resizer_ozone.cc" ]
   }
 
   if (is_chromeos) {
     # TODO(GYP): crbug.com/481627. These should only be included
     # when enable_me2me_host is true.
     sources -= [
+      "continue_window_linux.cc",
+      "curtain_mode_linux.cc",
+      "disconnect_window_linux.cc",
       "me2me_desktop_environment.cc",
       "me2me_desktop_environment.h",
     ]
-    deps += [
-      "//cc",
-      "//gpu/command_buffer/common",
-      "//ppapi/host",
-      "//skia",
-      "//ui/aura",
-      "//ui/compositor",
-      "//ui/events",
-      "//ui/views",
-    ]
+    deps += [ "//remoting/host/chromeos" ]
 
     if (use_ash) {
       deps += [ "//ash" ]
     }
 
     if (use_ozone) {
       deps += [ "//ui/ozone" ]
       sources -= [ "desktop_resizer_ozone.cc" ]
     } else {
       sources -= [
         "clipboard_x11.cc",
         "desktop_resizer_x11.cc",
         "input_injector_chromeos.cc",
         "input_injector_chromeos.h",
-        "linux/x_server_clipboard.cc",
-        "linux/x_server_clipboard.h",
         "local_input_monitor_x11.cc",
       ]
     }
-
-    sources -= [
-      "continue_window_linux.cc",
-      "curtain_mode_linux.cc",
-      "disconnect_window_linux.cc",
-    ]
   }
 
   if (is_mac) {
     libs += [
       "Accelerate.framework",
       "Carbon.framework",
     ]
 
-    # TODO(nicholss): When we can delete GYP builds,
-    # this flag and usage can be removed.
-    defines += [ "GN_BUILD=1" ]
     deps += [
       ":remoting_version",
       "//third_party/google_toolbox_for_mac",
     ]
   }
 
   if (is_win) {
     deps += [
       "//remoting/host/win",
       "//remoting/host/win:messages",
@@ skipping 49 matching lines @@
   }
 }
 
 # The host portions of the remoting unit tests.
 source_set("unit_tests") {
   testonly = true
 
   sources = [
     "audio_silence_detector_unittest.cc",
     "backoff_timer_unittest.cc",
-    "chromeos/aura_desktop_capturer_unittest.cc",
-    "chromeos/clipboard_aura_unittest.cc",
     "chromoting_host_context_unittest.cc",
     "chromoting_host_unittest.cc",
     "client_session_unittest.cc",
     "config_file_watcher_unittest.cc",
     "daemon_process_unittest.cc",
     "desktop_process_unittest.cc",
     "gcd_rest_client_unittest.cc",
     "gcd_state_updater_unittest.cc",
     "heartbeat_sender_unittest.cc",
     "host_attributes_unittest.cc",
     "host_change_notification_listener_unittest.cc",
     "host_config_unittest.cc",
     "host_extension_session_manager_unittest.cc",
     "host_power_save_blocker_unittest.cc",
     "host_session_options_unittest.cc",
     "host_status_logger_unittest.cc",
     "ipc_desktop_environment_unittest.cc",
     "it2me/it2me_confirmation_dialog_proxy_unittest.cc",
     "it2me/it2me_host_unittest.cc",
     "it2me/it2me_native_messaging_host_unittest.cc",
-    "linux/audio_pipe_reader_unittest.cc",
-    "linux/certificate_watcher_unittest.cc",
-    "linux/unicode_to_keysym_unittest.cc",
-    "linux/x11_character_injector_unittest.cc",
-    "linux/x_server_clipboard_unittest.cc",
     "local_input_monitor_unittest.cc",
     "mouse_cursor_monitor_proxy_unittest.cc",
     "mouse_shape_pump_unittest.cc",
     "native_messaging/native_messaging_reader_unittest.cc",
     "native_messaging/native_messaging_writer_unittest.cc",
     "pairing_registry_delegate_linux_unittest.cc",
     "pairing_registry_delegate_win_unittest.cc",
     "pin_hash_unittest.cc",
     "policy_watcher_unittest.cc",
     "register_support_host_request_unittest.cc",
     "remote_input_filter_unittest.cc",
     "resizing_host_observer_unittest.cc",
     "resources_unittest.cc",
     "screen_resolution_unittest.cc",
     "server_log_entry_host_unittest.cc",
     "setup/me2me_native_messaging_host_unittest.cc",
     "setup/oauth_helper_unittest.cc",
     "setup/pin_validator_unittest.cc",
     "third_party_auth_config_unittest.cc",
     "token_validator_base_unittest.cc",
     "token_validator_factory_impl_unittest.cc",
     "touch_injector_win_unittest.cc",
   ]
 
-  if (!use_x11 && is_linux) {
-    sources -= [ "linux/unicode_to_keysym_unittest.cc" ]
-  }
   if (use_ozone || is_chromeos) {
     sources -= [ "local_input_monitor_unittest.cc" ]
   }
-  if (is_chromeos) {
-    sources -= [ "linux/x_server_clipboard_unittest.cc" ]
-  }
 
   configs += [ "//remoting/build/config:version" ]
 
   deps = [
     ":host",
     ":test_support",
     "//remoting/host/it2me:common",
     "//remoting/host/native_messaging",
     "//remoting/host/security_key:unit_tests",
     "//remoting/host/setup",
     "//remoting/proto",
     "//remoting/resources",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
   ]
+
+  if (is_linux && !is_chromeos) {
+    deps += [ "//remoting/host/linux:unit_tests" ]
+  }
+
+  if (is_chromeos) {
+    deps += [
+      "//remoting/host/chromeos:unit_tests",
+      "//remoting/host/linux",  # for AudioPipeReader

[Sergey Ulanov, 2016/11/23 22:35:30]

This shouldn't be needed. AudioCapturerLinux is compiled on ChromeOS, but it
doesn't work there. It's better to exclude audio_capturer_linux.cc on chromeos
and add a stub audio_capturer_chromeos.cc (which would be the same as
audio_capturer_mac.cc).

[nicholss, 2017/04/24 18:01:03]

Done.

+    ]
+  }
+
   if (is_win) {
     deps += [ "//remoting/host/win:unit_tests" ]
   }
 
   if (enable_configuration_policy) {
     deps += [ "//components/policy/core/browser:test_support" ]
   }
 }
 
 group("remoting_host_branded") {
@@ skipping 165 matching lines @@
     }
 
     if (enable_webrtc) {
       deps += [
         "//third_party/libjingle/webrtc:libjingle_webrtc",
         "//third_party/webrtc/libjingle/xmllite",
         "//third_party/webrtc/libjingle/xmpp",
       ]
     }
 
-    if (is_desktop_linux) {
-      if (use_gtk3) {
-        deps += [ "//build/config/linux/gtk3" ]
-      } else {
-        deps += [ "//build/config/linux/gtk2" ]
-      }
-    }
     if ((is_linux && !is_chromeos) || is_mac) {
       libs = [ "pam" ]
     }
 
     if (is_mac && is_official_build) {
       sources += [ "internal/internal_mac-inl.h" ]
     }
 
     if (remoting_multi_process != 0) {
       deps += [ "//mojo/edk/system" ]
@@ skipping 73 matching lines @@
     group("remoting_me2me_host_archive") {
       deps = [
         "//remoting/host/installer/mac:remoting_me2me_host_archive",
       ]
     }
   } else {
     group("remoting_me2me_host_archive") {
     }
   }
 }