Fixing building of remoting_unittests_apk target.

BUG=

Review URL: https://codereview.chromium.org/1010803014

Cr-Commit-Position: refs/heads/master@{#322482}

remoting/BUILD.gn

@@ -113,7 +113,10 @@ if (!is_win && !is_mac) {
     if (is_android) {
       deps += [ "//testing/android:native_test_native_code" ]
     } else {
-      deps += [ "//remoting/client/plugin" ]
+      deps += [
+        "//remoting/client/plugin",
+        "//remoting/client/plugin:unit_tests",
+      ]
     }
 
     if (enable_remoting_host) {

remoting/client/BUILD.gn

@@ -30,15 +30,9 @@ source_set("unit_tests") {
     "audio_player_unittest.cc",
     "client_status_logger_unittest.cc",
     "key_event_mapper_unittest.cc",
-    "plugin/empty_cursor_filter_unittest.cc",
-    "plugin/normalizing_input_filter_mac_unittest.cc",
     "server_log_entry_client_unittest.cc",
   ]
 
-  if (is_chromeos) {
-    sources += [ "plugin/normalizing_input_filter_cros_unittest.cc" ]
-  }
-
   deps = [
     ":client",
     "//remoting/proto",

remoting/client/plugin/BUILD.gn

@@ -40,3 +40,25 @@ source_set("plugin") {
     "//ui/events:dom4_keycode_converter",
   ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "empty_cursor_filter_unittest.cc",
+    "normalizing_input_filter_mac_unittest.cc",
+    "touch_input_scaler_unittest.cc",
+  ]
+
+  if (is_chromeos) {
+    sources += [ "normalizing_input_filter_cros_unittest.cc" ]
+  }
+
+  deps = [
+    ":plugin",
+    "//remoting/proto",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/webrtc",
+  ]
+}

remoting/remoting_test.gypi

@@ -249,8 +249,6 @@
         'protocol/ssl_hmac_channel_authenticator_unittest.cc',
         'protocol/third_party_authenticator_unittest.cc',
         'protocol/v2_authenticator_unittest.cc',
-        'signaling/fake_signal_strategy.cc',
-        'signaling/fake_signal_strategy.h',
         'signaling/iq_sender_unittest.cc',
         'signaling/log_to_server_unittest.cc',
         'signaling/server_log_entry_unittest.cc',
@@ -282,6 +280,9 @@
           'dependencies!': [
             'remoting_client_plugin',
           ],
+          'sources/': [
+            ['exclude', '^client/plugin/'],
+          ]
         }],
         [ 'OS=="android"', {
           'dependencies': [