Revert of Moving CRD Windows targets to subdirectories.

remoting/BUILD.gn

 # Copyright 2015 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("//remoting/build/config/remoting_build.gni")
 
 group("remoting_all") {
   testonly = true
 
   deps = [
     ":remoting_unittests",
     "//remoting/test:chromoting_test_driver",
     "//remoting/webapp:browser_test_resources",
     "//remoting/webapp:unit_tests",
   ]
 
   if ((is_linux && !is_chromeos) || is_win || is_mac) {
     deps += [ "//remoting/webapp" ]
   }
 
   if (is_win) {
     deps += [
       "//remoting:remoting_breakpad_tester",
-      "//remoting/host/win:all",
+      "//remoting/host:remoting_console",
+      "//remoting/host:remoting_desktop",
     ]
 
     if (is_chrome_branded) {
       deps += [ "//remoting/host:remoting_host_installation" ]
     }
   }
 
   if (is_android) {
     deps += [
       "//remoting/android:remoting_apk",
@@ skipping 12 matching lines @@
         "//remoting/host:remoting_native_messaging_manifests",
         "//remoting/host:remoting_start_host",
         "//remoting/host/it2me:remote_assistance_host",
       ]
 
       if (is_win) {
         deps += [ "//remoting/host/it2me:remote_assistance_host_uiaccess" ]
       }
     }
 
-    if (is_win || (!is_chromeos && !is_android && !is_ios)) {
+    # The same target is called differently on Linux.
+    # TODO(sergeyu): Rename it to remoting_native_messaging_host on all
+    # platforms.
+    if (is_win) {
       deps += [ "//remoting/host:remoting_native_messaging_host" ]
+    } else if (!is_chromeos && !is_android) {
+      deps += [ "//remoting/host:native_messaging_host" ]
     }
 
     if (is_linux && !is_chromeos) {
       deps += [ "//remoting/host:remoting_dev_me2me_host" ]
     }
   }
 
   if (enable_me2me_host) {
     deps += [ "//remoting/host:remoting_me2me_host" ]
     if (is_chrome_branded) {
       deps += [ "//remoting/host:remoting_me2me_host_archive" ]
     }
   }
 
   if (enable_nacl) {
     deps += [ "//remoting/tools/javascript_key_tester" ]
   }
 }
 
 if (is_win) {
   # GYP version: remoting/remoting_host_win.gypi:remoting_breakpad_tester
   executable("remoting_breakpad_tester") {
     deps = [
       "//base",
       "//build/win:default_exe_manifest",
       "//remoting/host",
     ]
 
-    libs = []
-
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
     sources = [
       "tools/breakpad_tester_win.cc",
     ]
-
-    if (is_win) {
-      libs += [
-        "rpcrt4.lib",
-        "wtsapi32.lib",
-      ]
-    }
   }
 }
 
 # GYP version: remoting/remoting_test.gypi:remoting_test_support
 group("test_support") {
   testonly = true
 
   deps = [
     "//base",
     "//net",
@@ skipping 68 matching lines @@
     ]
   }
 
   if (enable_configuration_policy) {
     #deps += [ "//components/policy/core/browser:test_support" ]
   }
 }
 
 if (enable_remoting_host) {
   test("remoting_perftests") {
-    defines = []
-    libs = []
-
     sources = [
       "test/codec_perftest.cc",
       "test/protocol_perftest.cc",
     ]
 
     configs += [ "//remoting/build/config:version" ]
 
     deps = [
       ":test_support",
       "//base",
       "//base/test:run_all_unittests",
       "//base/test:test_support",
       "//net:test_support",
       "//remoting/base",
       "//testing/gtest",
       "//third_party/libjingle",
       "//third_party/webrtc/modules/desktop_capture",
     ]
 
     if (enable_webrtc) {
       deps += [ "//third_party/libjingle:libjingle_webrtc" ]
     }
-
-    if (is_win) {
-      defines += [ "_ALT_NO_EXCEPTIONS" ]
-
-      libs += [
-        "rpcrt4.lib",
-        "wtsapi32.lib",
-      ]
-    }
   }
 }