Remote virtual connections [1/3]: Refactor VCRouter to extend VCManager.

This is a clean-up patch to simplify code structure. Before this patch,
all clients of VirtualConnectionRouter need to instantiate both a
VirtualConnectionManager and a VirtualConnectionRouter, and then pass
the former (by pointer) to the latter. After this patch, VCR extends
VCM, and clients need not worry about a VCM.

Bug: b/162542369
Change-Id: I0dff69819d9b5282a43643a2da0fe33e7bf0a3fd
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2546803
Reviewed-by: Brandon Tolsch <btolsch@chromium.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/cast/sender/cast_platform_client.h b/cast/sender/cast_platform_client.h
index 41ad7fc7..8ea9a99a 100644
--- a/cast/sender/cast_platform_client.h
+++ b/cast/sender/cast_platform_client.h
@@ -7,7 +7,9 @@
 
 #include <functional>
 #include <map>
+#include <memory>
 #include <string>
+#include <vector>
 
 #include "absl/types/optional.h"
 #include "cast/common/channel/cast_message_handler.h"
@@ -19,7 +21,6 @@ namespace openscreen {
 namespace cast {
 
 struct ServiceInfo;
-class VirtualConnectionManager;
 class VirtualConnectionRouter;
 
 // This class handles Cast messages that generally relate to the "platform", in
@@ -35,7 +36,6 @@ class CastPlatformClient final : public CastMessageHandler {
       std::function<void(const std::string& app_id, AppAvailabilityResult)>;
 
   CastPlatformClient(VirtualConnectionRouter* router,
-                     VirtualConnectionManager* manager,
                      ClockNowFunctionPtr clock,
                      TaskRunner* task_runner);
   ~CastPlatformClient() override;
@@ -82,7 +82,6 @@ class CastPlatformClient final : public CastMessageHandler {
 
   const std::string sender_id_;
   VirtualConnectionRouter* const virtual_conn_router_;
-  VirtualConnectionManager* const virtual_conn_manager_;
   std::map<std::string /* device_id */, int> socket_id_by_device_id_;
   std::map<std::string /* device_id */, PendingRequests>
       pending_requests_by_device_id_;