Fix gn check errors for chromium

Bug: 1159043, 1159044, 1159045, 1159046, 1159047
Bug: 1159048, 1159049, 1159050, 1159051
Change-Id: I4c01784608057662fc432f4ac35ced7c0be9b601
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2678725
Commit-Queue: Brandon Tolsch <btolsch@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>

8 files changed, 32 insertions, 43 deletions

diff --git a/osp/BUILD.gn b/osp/BUILD.gn
index 031ae2ea..14bb1ae1 100644
--- a/osp/BUILD.gn
+++ b/osp/BUILD.gn
@@ -5,22 +5,14 @@
 import("build/config/services.gni")
 
 source_set("osp") {
-  public_deps = [
-    "public",
-  ]
-  deps = [
-    "impl",
-  ]
+  public_deps = [ "public" ]
+  deps = [ "impl" ]
 }
 
 if (use_chromium_quic) {
   source_set("osp_with_chromium_quic") {
-    public_deps = [
-      ":osp",
-    ]
-    deps = [
-      "impl:chromium_quic_integration",
-    ]
+    public_deps = [ ":osp" ]
+    deps = [ "impl:chromium_quic_integration" ]
   }
 }
 
@@ -44,10 +36,13 @@ source_set("unittests") {
   ]
 
   deps = [
+    "../platform:base",
     "../platform:test",
     "../third_party/abseil",
     "../third_party/googletest:gmock",
     "../third_party/googletest:gtest",
+    "../third_party/tinycbor",
+    "../util",
     "impl",
     "impl/quic:test_support",
     "public",
@@ -63,9 +58,7 @@ source_set("unittests") {
 
 if (use_chromium_quic && use_mdns_responder) {
   executable("osp_demo") {
-    sources = [
-      "demo/osp_demo.cc",
-    ]
+    sources = [ "demo/osp_demo.cc" ]
     deps = [
       ":osp_with_chromium_quic",
       "//osp/impl/discovery/mdns",
diff --git a/osp/impl/BUILD.gn b/osp/impl/BUILD.gn
index 779300bb..83326f57 100644
--- a/osp/impl/BUILD.gn
+++ b/osp/impl/BUILD.gn
@@ -8,6 +8,7 @@ source_set("impl") {
   sources = [
     "mdns_platform_service.cc",
     "mdns_platform_service.h",
+    "message_demuxer.cc",
     "network_service_manager.cc",
     "presentation/presentation_common.cc",
     "presentation/presentation_common.h",
@@ -38,8 +39,8 @@ source_set("impl") {
   }
 
   public_deps = [
-    "../../osp/msgs",
-    "../../osp/public",
+    "../msgs",
+    "../public",
   ]
   deps = [
     "../../platform",
@@ -63,11 +64,11 @@ if (use_chromium_quic) {
     public_configs = [ "../../third_party/chromium_quic:chromium_quic_config" ]
 
     deps = [
-      "../../osp/msgs",
       "../../platform",
       "../../third_party/abseil",
       "../../third_party/chromium_quic",
       "../../util",
+      "../msgs",
       "quic",
     ]
   }
diff --git a/osp/public/message_demuxer.cc b/osp/impl/message_demuxer.cc
index 986bac9b..986bac9b 100644
--- a/osp/public/message_demuxer.cc
+++ b/osp/impl/message_demuxer.cc
diff --git a/osp/impl/presentation/presentation_controller.cc b/osp/impl/presentation/presentation_controller.cc
index 6d948ce1..7aa093c0 100644
--- a/osp/impl/presentation/presentation_controller.cc
+++ b/osp/impl/presentation/presentation_controller.cc
@@ -11,10 +11,10 @@
 #include "absl/types/optional.h"
 #include "osp/impl/presentation/url_availability_requester.h"
 #include "osp/msgs/osp_messages.h"
-#include "osp/msgs/request_response_handler.h"
 #include "osp/public/message_demuxer.h"
 #include "osp/public/network_service_manager.h"
 #include "osp/public/protocol_connection_client.h"
+#include "osp/public/request_response_handler.h"
 #include "util/osp_logging.h"
 
 namespace openscreen {
diff --git a/osp/impl/quic/BUILD.gn b/osp/impl/quic/BUILD.gn
index 221af394..e9f1e2c5 100644
--- a/osp/impl/quic/BUILD.gn
+++ b/osp/impl/quic/BUILD.gn
@@ -33,8 +33,14 @@ source_set("test_support") {
     "testing/quic_test_support.h",
   ]
 
-  deps = [
+  public_deps = [
+    ":quic",
     "../../../platform",
+    "../../../platform:test",
+    "../../public",
+  ]
+
+  deps = [
     "../../../third_party/abseil",
     "../../../third_party/googletest:gmock",
     "../../../util",
diff --git a/osp/msgs/BUILD.gn b/osp/msgs/BUILD.gn
index 0e18ea99..8dcb69d5 100644
--- a/osp/msgs/BUILD.gn
+++ b/osp/msgs/BUILD.gn
@@ -6,12 +6,9 @@ source_set("msgs") {
   sources = [
     target_gen_dir + "/osp_messages.cc",
     target_gen_dir + "/osp_messages.h",
-    "request_response_handler.h",
   ]
 
-  public_deps = [
-    ":cddl_gen",
-  ]
+  public_deps = [ ":cddl_gen" ]
   deps = [
     "../../third_party/abseil",
     "../../third_party/tinycbor",
@@ -29,9 +26,7 @@ config("cddl_gen_config") {
 
 action("cddl_gen") {
   script = "../../tools/cddl/cddl.py"
-  sources = [
-    "osp_messages.cddl",
-  ]
+  sources = [ "osp_messages.cddl" ]
   outputs_src = rebase_path([
                               "osp_messages.h",
                               "osp_messages.cc",
@@ -61,17 +56,13 @@ action("cddl_gen") {
         rebase_path("cddl.log", "//"),
       ] + rebase_path(sources, root_build_dir)
 
-  deps = [
-    cddl_label,
-  ]
+  deps = [ cddl_label ]
 }
 
 source_set("unittests") {
   testonly = true
 
-  sources = [
-    "messages_unittest.cc",
-  ]
+  sources = [ "messages_unittest.cc" ]
 
   deps = [
     ":msgs",
diff --git a/osp/public/BUILD.gn b/osp/public/BUILD.gn
index 779d1d9a..cc915c60 100644
--- a/osp/public/BUILD.gn
+++ b/osp/public/BUILD.gn
@@ -12,7 +12,6 @@ source_set("public") {
     "endpoint_request_ids.h",
     "mdns_service_listener_factory.h",
     "mdns_service_publisher_factory.h",
-    "message_demuxer.cc",
     "message_demuxer.h",
     "network_metrics.h",
     "network_service_manager.h",
@@ -27,6 +26,7 @@ source_set("public") {
     "protocol_connection_server.cc",
     "protocol_connection_server.h",
     "protocol_connection_server_factory.h",
+    "request_response_handler.h",
     "server_config.cc",
     "server_config.h",
     "service_info.cc",
@@ -38,9 +38,7 @@ source_set("public") {
     "timestamp.h",
   ]
 
-  public_deps = [
-    "../msgs",
-  ]
+  public_deps = [ "../msgs" ]
 
   deps = [
     "../../platform",
@@ -51,7 +49,5 @@ source_set("public") {
 source_set("test_support") {
   testonly = true
 
-  sources = [
-    "testing/message_demuxer_test_support.h",
-  ]
+  sources = [ "testing/message_demuxer_test_support.h" ]
 }
diff --git a/osp/msgs/request_response_handler.h b/osp/public/request_response_handler.h
index c0cc8824..de783efc 100644
--- a/osp/msgs/request_response_handler.h
+++ b/osp/public/request_response_handler.h
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef OSP_MSGS_REQUEST_RESPONSE_HANDLER_H_
-#define OSP_MSGS_REQUEST_RESPONSE_HANDLER_H_
+#ifndef OSP_PUBLIC_REQUEST_RESPONSE_HANDLER_H_
+#define OSP_PUBLIC_REQUEST_RESPONSE_HANDLER_H_
 
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
+#include <utility>
+#include <vector>
 
 #include "absl/types/optional.h"
 #include "osp/public/message_demuxer.h"
@@ -224,4 +226,4 @@ class RequestResponseHandler : public MessageDemuxer::MessageCallback {
 }  // namespace osp
 }  // namespace openscreen
 
-#endif  // OSP_MSGS_REQUEST_RESPONSE_HANDLER_H_
+#endif  // OSP_PUBLIC_REQUEST_RESPONSE_HANDLER_H_