Move code that doesn't depend on PPAPI out of remoting/client/plugin

remoting/client/plugin contained some files that didn't depend on PPAPI
and had unittests. Once the plugin is removed from chrome the plugin
will only be compiled for PNaCl, but in order to keep the unittests
working these files will still need to be compiled natively. Moving them
out of the plugin directory makes it clear which files are compiled
only for PNaCl. Also the moved files are not specific to the plugin
and would be useful in a native app if we were to implement one.

BUG=510271

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

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

21 files changed, 52 insertions, 81 deletions

diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn
index 9be8a41..0aeb666 100644
--- a/remoting/BUILD.gn
+++ b/remoting/BUILD.gn
@@ -182,11 +182,6 @@ if (!is_mac) {
 
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_native_code" ]
-    } else {
-      deps += [
-        "//remoting/client/plugin",
-        "//remoting/client/plugin:unit_tests",
-      ]
     }
 
     if (enable_remoting_host) {
diff --git a/remoting/client/plugin/empty_cursor_filter.cc b/remoting/client/empty_cursor_filter.cc
index 15180fa..085de58 100644
--- a/remoting/client/plugin/empty_cursor_filter.cc
+++ b/remoting/client/empty_cursor_filter.cc
@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "remoting/client/plugin/empty_cursor_filter.h"
+#include "remoting/client/empty_cursor_filter.h"
 
 #include <algorithm>
 
diff --git a/remoting/client/plugin/empty_cursor_filter.h b/remoting/client/empty_cursor_filter.h
index fdd7355..ed14e5c 100644
--- a/remoting/client/plugin/empty_cursor_filter.h
+++ b/remoting/client/empty_cursor_filter.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef REMOTING_CLIENT_PLUGIN_EMPTY_CURSOR_FILTER_H_
-#define REMOTING_CLIENT_PLUGIN_EMPTY_CURSOR_FILTER_H_
+#ifndef REMOTING_CLIENT_EMPTY_CURSOR_FILTER_H_
+#define REMOTING_CLIENT_EMPTY_CURSOR_FILTER_H_
 
 #include "remoting/protocol/cursor_shape_stub.h"
 
@@ -40,4 +40,4 @@ class EmptyCursorFilter : public protocol::CursorShapeStub {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_PLUGIN_EMPTY_CURSOR_FILTER_H_
+#endif  // REMOTING_CLIENT_EMPTY_CURSOR_FILTER_H_
diff --git a/remoting/client/plugin/empty_cursor_filter_unittest.cc b/remoting/client/empty_cursor_filter_unittest.cc
index 8cdeb7d..3fa98ac 100644
--- a/remoting/client/plugin/empty_cursor_filter_unittest.cc
+++ b/remoting/client/empty_cursor_filter_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "remoting/client/plugin/empty_cursor_filter.h"
+#include "remoting/client/empty_cursor_filter.h"
 
 #include <ostream>
 
diff --git a/remoting/client/plugin/normalizing_input_filter_cros.cc b/remoting/client/normalizing_input_filter_cros.cc
index ed5d438..9ab8bc9 100644
--- a/remoting/client/plugin/normalizing_input_filter_cros.cc
+++ b/remoting/client/normalizing_input_filter_cros.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "remoting/client/plugin/normalizing_input_filter_cros.h"
+#include "remoting/client/normalizing_input_filter_cros.h"
 
 #include "base/logging.h"
 #include "remoting/protocol/usb_key_codes.h"
diff --git a/remoting/client/plugin/normalizing_input_filter_cros.h b/remoting/client/normalizing_input_filter_cros.h
index c239dfc..e20eb59 100644
--- a/remoting/client/plugin/normalizing_input_filter_cros.h
+++ b/remoting/client/normalizing_input_filter_cros.h
@@ -1,10 +1,12 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "remoting/protocol/input_filter.h"
+#ifndef REMOTING_CLIENT_NORMALIZING_INPUT_FILTER_CROS_H_
+#define REMOTING_CLIENT_NORMALIZING_INPUT_FILTER_CROS_H_
 
 #include "remoting/proto/event.pb.h"
+#include "remoting/protocol/input_filter.h"
 
 namespace remoting {
 
@@ -59,3 +61,5 @@ class NormalizingInputFilterCros : public protocol::InputFilter {
 };
 
 }  // namespace remoting
+
+#endif  // REMOTING_CLIENT_NORMALIZING_INPUT_FILTER_CROS_H_
diff --git a/remoting/client/plugin/normalizing_input_filter_cros_unittest.cc b/remoting/client/normalizing_input_filter_cros_unittest.cc
index 74fc189..240beaa 100644
--- a/remoting/client/plugin/normalizing_input_filter_cros_unittest.cc
+++ b/remoting/client/normalizing_input_filter_cros_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "remoting/client/plugin/normalizing_input_filter_cros.h"
+#include "remoting/client/normalizing_input_filter_cros.h"
 
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/protocol_mock_objects.h"
diff --git a/remoting/client/plugin/normalizing_input_filter_mac.cc b/remoting/client/normalizing_input_filter_mac.cc
index ca2fa4b..a3d3661 100644
--- a/remoting/client/plugin/normalizing_input_filter_mac.cc
+++ b/remoting/client/normalizing_input_filter_mac.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "remoting/client/plugin/normalizing_input_filter_mac.h"
+#include "remoting/client/normalizing_input_filter_mac.h"
 
 #include <map>
 #include <vector>
diff --git a/remoting/client/plugin/normalizing_input_filter_mac.h b/remoting/client/normalizing_input_filter_mac.h
index a262cda..26636ad 100644
--- a/remoting/client/plugin/normalizing_input_filter_mac.h
+++ b/remoting/client/normalizing_input_filter_mac.h
@@ -1,7 +1,10 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
+#ifndef REMOTING_CLIENT_NORMALIZING_INPUT_FILTER_MAC_H_
+#define REMOTING_CLIENT_NORMALIZING_INPUT_FILTER_MAC_H_
+
 #include <map>
 
 #include "remoting/protocol/input_filter.h"
@@ -63,3 +66,5 @@ class NormalizingInputFilterMac : public protocol::InputFilter {
 };
 
 }  // namespace remoting
+
+#endif  // REMOTING_CLIENT_NORMALIZING_INPUT_FILTER_MAC_H_
diff --git a/remoting/client/plugin/normalizing_input_filter_mac_unittest.cc b/remoting/client/normalizing_input_filter_mac_unittest.cc
index 46a1295..202d467 100644
--- a/remoting/client/plugin/normalizing_input_filter_mac_unittest.cc
+++ b/remoting/client/normalizing_input_filter_mac_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "remoting/client/plugin/normalizing_input_filter_mac.h"
+#include "remoting/client/normalizing_input_filter_mac.h"
 
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/protocol_mock_objects.h"
diff --git a/remoting/client/plugin/BUILD.gn b/remoting/client/plugin/BUILD.gn
index c0a21f9..0d5e2847 100644
--- a/remoting/client/plugin/BUILD.gn
+++ b/remoting/client/plugin/BUILD.gn
@@ -10,13 +10,6 @@ source_set("plugin") {
                   ".",
                   "//remoting")
 
-  if (!is_chromeos) {
-    sources -= [
-      "normalizing_input_filter_cros.cc",
-      "normalizing_input_filter_cros.h",
-    ]
-  }
-
   # TODO(GYP) when a nacl version of this target is made, these files
   # won't be part of it.
   sources += [
@@ -40,25 +33,3 @@ source_set("plugin") {
     "//ui/events:dom_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",
-  ]
-}
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index c32d31d..1bab057 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -38,9 +38,9 @@
 #include "remoting/base/constants.h"
 #include "remoting/base/util.h"
 #include "remoting/client/chromoting_client.h"
+#include "remoting/client/normalizing_input_filter_cros.h"
+#include "remoting/client/normalizing_input_filter_mac.h"
 #include "remoting/client/plugin/delegating_signal_strategy.h"
-#include "remoting/client/plugin/normalizing_input_filter_cros.h"
-#include "remoting/client/plugin/normalizing_input_filter_mac.h"
 #include "remoting/client/plugin/pepper_audio_player.h"
 #include "remoting/client/plugin/pepper_mouse_locker.h"
 #include "remoting/client/plugin/pepper_port_allocator.h"
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index 7f600bb..3c01a83 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -19,13 +19,13 @@
 #include "ppapi/cpp/var.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/client_user_interface.h"
+#include "remoting/client/empty_cursor_filter.h"
 #include "remoting/client/key_event_mapper.h"
-#include "remoting/client/plugin/empty_cursor_filter.h"
 #include "remoting/client/plugin/pepper_cursor_setter.h"
 #include "remoting/client/plugin/pepper_input_handler.h"
 #include "remoting/client/plugin/pepper_plugin_thread_delegate.h"
 #include "remoting/client/plugin/pepper_video_renderer.h"
-#include "remoting/client/plugin/touch_input_scaler.h"
+#include "remoting/client/touch_input_scaler.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_stub.h"
diff --git a/remoting/client/plugin/pepper_cursor_setter.cc b/remoting/client/plugin/pepper_cursor_setter.cc
index 90052b1..3d1effd 100644
--- a/remoting/client/plugin/pepper_cursor_setter.cc
+++ b/remoting/client/plugin/pepper_cursor_setter.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/mouse_cursor.h"
-#include "remoting/client/plugin/empty_cursor_filter.h"
+#include "remoting/client/empty_cursor_filter.h"
 #include "remoting/proto/control.pb.h"
 
 namespace remoting {
diff --git a/remoting/client/plugin/pepper_mouse_locker.cc b/remoting/client/plugin/pepper_mouse_locker.cc
index b8cc19f..0171763 100644
--- a/remoting/client/plugin/pepper_mouse_locker.cc
+++ b/remoting/client/plugin/pepper_mouse_locker.cc
@@ -5,7 +5,7 @@
 #include "remoting/client/plugin/pepper_mouse_locker.h"
 
 #include "base/logging.h"
-#include "remoting/client/plugin/empty_cursor_filter.h"
+#include "remoting/client/empty_cursor_filter.h"
 #include "remoting/proto/control.pb.h"
 
 namespace remoting {
diff --git a/remoting/client/plugin/touch_input_scaler.cc b/remoting/client/touch_input_scaler.cc
index 11396ab..80c749c 100644
--- a/remoting/client/plugin/touch_input_scaler.cc
+++ b/remoting/client/touch_input_scaler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/plugin/touch_input_scaler.h"
+#include "remoting/client/touch_input_scaler.h"
 
 #include "base/logging.h"
 #include "remoting/proto/event.pb.h"
diff --git a/remoting/client/plugin/touch_input_scaler.h b/remoting/client/touch_input_scaler.h
index 5161791..b9c93e8 100644
--- a/remoting/client/plugin/touch_input_scaler.h
+++ b/remoting/client/touch_input_scaler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_PLUGIN_TOUCH_INPUT_SCALER_H_
-#define REMOTING_CLIENT_PLUGIN_TOUCH_INPUT_SCALER_H_
+#ifndef REMOTING_CLIENT_TOUCH_INPUT_SCALER_H_
+#define REMOTING_CLIENT_TOUCH_INPUT_SCALER_H_
 
 #include "remoting/protocol/input_filter.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
@@ -45,4 +45,4 @@ class TouchInputScaler : public protocol::InputFilter {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_PLUGIN_TOUCH_INPUT_SCALER_H_
+#endif  // REMOTING_CLIENT_TOUCH_INPUT_SCALER_H_
diff --git a/remoting/client/plugin/touch_input_scaler_unittest.cc b/remoting/client/touch_input_scaler_unittest.cc
index 18e6611..2e779f1 100644
--- a/remoting/client/plugin/touch_input_scaler_unittest.cc
+++ b/remoting/client/touch_input_scaler_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/plugin/touch_input_scaler.h"
+#include "remoting/client/touch_input_scaler.h"
 
 #include <cmath>
 
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp
index 1e29858..bbe8f44 100644
--- a/remoting/remoting_nacl.gyp
+++ b/remoting/remoting_nacl.gyp
@@ -131,7 +131,7 @@
       'target_conditions': [
         ['1==1', {
           'sources/': [
-            [ 'include', 'client/plugin/normalizing_input_filter_mac.cc' ],
+            [ 'include', 'client/normalizing_input_filter_mac.cc' ],
           ],
         }],
       ],
diff --git a/remoting/remoting_srcs.gypi b/remoting/remoting_srcs.gypi
index 968ab1b..c51a724 100644
--- a/remoting/remoting_srcs.gypi
+++ b/remoting/remoting_srcs.gypi
@@ -234,18 +234,26 @@
       'client/client_status_logger.cc',
       'client/client_status_logger.h',
       'client/client_user_interface.h',
+      'client/empty_cursor_filter.cc',
+      'client/empty_cursor_filter.h',
       'client/frame_consumer.h',
       'client/frame_consumer_proxy.cc',
       'client/frame_consumer_proxy.h',
       'client/frame_producer.h',
       'client/key_event_mapper.cc',
       'client/key_event_mapper.h',
+      'client/normalizing_input_filter_cros.cc',
+      'client/normalizing_input_filter_cros.h',
+      'client/normalizing_input_filter_mac.cc',
+      'client/normalizing_input_filter_mac.h',
       'client/server_log_entry_client.cc',
       'client/server_log_entry_client.h',
       'client/software_video_renderer.cc',
       'client/software_video_renderer.h',
       'client/token_fetcher_proxy.cc',
       'client/token_fetcher_proxy.h',
+      'client/touch_input_scaler.cc',
+      'client/touch_input_scaler.h',
       'client/video_renderer.h',
     ],
 
@@ -254,12 +262,6 @@
       'client/plugin/chromoting_instance.h',
       'client/plugin/delegating_signal_strategy.cc',
       'client/plugin/delegating_signal_strategy.h',
-      'client/plugin/empty_cursor_filter.cc',
-      'client/plugin/empty_cursor_filter.h',
-      'client/plugin/normalizing_input_filter_cros.cc',
-      'client/plugin/normalizing_input_filter_cros.h',
-      'client/plugin/normalizing_input_filter_mac.cc',
-      'client/plugin/normalizing_input_filter_mac.h',
       'client/plugin/pepper_address_resolver.cc',
       'client/plugin/pepper_address_resolver.h',
       'client/plugin/pepper_audio_player.cc',
@@ -285,8 +287,6 @@
       'client/plugin/pepper_video_renderer_2d.h',
       'client/plugin/pepper_video_renderer_3d.cc',
       'client/plugin/pepper_video_renderer_3d.h',
-      'client/plugin/touch_input_scaler.cc',
-      'client/plugin/touch_input_scaler.h',
     ],
   }
 }
diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi
index 73a9f17..a665b50 100644
--- a/remoting/remoting_test.gypi
+++ b/remoting/remoting_test.gypi
@@ -261,12 +261,12 @@
         'base/util_unittest.cc',
         'client/audio_player_unittest.cc',
         'client/client_status_logger_unittest.cc',
+        'client/empty_cursor_filter_unittest.cc',
         'client/key_event_mapper_unittest.cc',
-        'client/plugin/empty_cursor_filter_unittest.cc',
-        'client/plugin/normalizing_input_filter_cros_unittest.cc',
-        'client/plugin/normalizing_input_filter_mac_unittest.cc',
-        'client/plugin/touch_input_scaler_unittest.cc',
+        'client/normalizing_input_filter_cros_unittest.cc',
+        'client/normalizing_input_filter_mac_unittest.cc',
         'client/server_log_entry_client_unittest.cc',
+        'client/touch_input_scaler_unittest.cc',
         'codec/audio_encoder_opus_unittest.cc',
         'codec/codec_test.cc',
         'codec/codec_test.h',
@@ -407,9 +407,6 @@
           'dependencies!': [
             'remoting_client_plugin',
           ],
-          'sources/': [
-            ['exclude', '^client/plugin/'],
-          ]
         }],
         [ 'OS=="android"', {
           'dependencies': [
@@ -418,7 +415,6 @@
         }],
         [ 'chromeos==0', {
           'sources!': [
-            'client/plugin/normalizing_input_filter_cros_unittest.cc',
             'host/chromeos/aura_desktop_capturer_unittest.cc',
             'host/clipboard_aura_unittest.cc',
           ],