1 files changed, 68 insertions, 7 deletions

diff --git a/remoting/protocol/BUILD.gn b/remoting/protocol/BUILD.gn
index 34b38af..a442695 100644
--- a/remoting/protocol/BUILD.gn
+++ b/remoting/protocol/BUILD.gn
@@ -2,14 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("protocol") {
-  gypi_values = exec_script("//build/gypi_to_gn.py",
-                            [ rebase_path("../remoting_srcs.gypi") ],
-                            "scope",
-                            [ "../remoting_srcs.gypi" ])
+import("//remoting/remoting_srcs.gni")
 
-  sources =
-      rebase_path(gypi_values.remoting_protocol_sources, ".", "//remoting")
+source_set("protocol") {
+  sources = rebase_path(remoting_srcs_gypi_values.remoting_protocol_sources,
+                        ".",
+                        "//remoting")
 
   configs += [
     "//build/config/compiler:no_size_t_to_int_warning",
@@ -17,6 +15,7 @@ static_library("protocol") {
   ]
 
   public_deps = [
+    "//remoting/proto",
     "//third_party/libjingle",
   ]
   deps = [
@@ -26,5 +25,67 @@ static_library("protocol") {
     "//jingle:notifier",
     "//net",
     "//remoting/base",
+    "//remoting/codec",
+  ]
+}
+
+source_set("test_support") {
+  testonly = true
+
+  sources = [
+    "fake_authenticator.cc",
+    "fake_authenticator.h",
+    "fake_datagram_socket.cc",
+    "fake_datagram_socket.h",
+    "fake_session.cc",
+    "fake_session.h",
+    "fake_stream_socket.cc",
+    "fake_stream_socket.h",
+    "protocol_mock_objects.cc",
+    "protocol_mock_objects.h",
+  ]
+
+  public_deps = [
+    ":protocol",
+    "//testing/gmock",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "authenticator_test_base.cc",
+    "authenticator_test_base.h",
+    "channel_multiplexer_unittest.cc",
+    "chromium_socket_factory_unittest.cc",
+    "client_video_dispatcher_unittest.cc",
+    "clipboard_echo_filter_unittest.cc",
+    "clipboard_filter_unittest.cc",
+    "connection_tester.cc",
+    "connection_tester.h",
+    "connection_to_client_unittest.cc",
+    "content_description_unittest.cc",
+    "input_event_tracker_unittest.cc",
+    "input_filter_unittest.cc",
+    "jingle_messages_unittest.cc",
+    "jingle_session_unittest.cc",
+    "message_decoder_unittest.cc",
+    "message_reader_unittest.cc",
+    "monitored_video_stub_unittest.cc",
+    "mouse_input_filter_unittest.cc",
+    "negotiating_authenticator_unittest.cc",
+    "network_settings_unittest.cc",
+    "pairing_registry_unittest.cc",
+    "ppapi_module_stub.cc",
+    "ssl_hmac_channel_authenticator_unittest.cc",
+    "third_party_authenticator_unittest.cc",
+    "v2_authenticator_unittest.cc",
+  ]
+
+  deps = [
+    ":test_support",
+    "//testing/gmock",
+    "//testing/gtest",
   ]
 }