Move keyboard_socket_path to config_instance_derived.cc

Bug: b/474188702

#gemini

Author: Databean

base/cvd/cuttlefish/host/commands/run_cvd/launch/vhost_input_devices.cpp

@@ -293,7 +293,7 @@ class VhostInputDevices : public CommandSource,
                     "Failed to setup sockets for gamepad device");
     }
     keyboard_sockets_ =
-        CF_EXPECT(NewDeviceSockets(instance_.keyboard_socket_path()),
+        CF_EXPECT(NewDeviceSockets(KeyboardSocketPath(instance_)),
                   "Failed to setup sockets for keyboard device");
     switches_sockets_ =
         CF_EXPECT(NewDeviceSockets(instance_.switches_socket_path()),

base/cvd/cuttlefish/host/libs/config/config_instance_derived.cc

@@ -54,6 +54,10 @@ std::string KernelLogPipeName(const CuttlefishConfig::InstanceSpecific& ins) {
   return AbsolutePath(ins.PerInstanceInternalPath("kernel-log-pipe"));
 }
 
+std::string KeyboardSocketPath(const CuttlefishConfig::InstanceSpecific& ins) {
+  return ins.PerInstanceInternalUdsPath("keyboard.sock");
+}
+
 std::string LauncherMonitorSocketPath(
     const CuttlefishConfig::InstanceSpecific& ins) {
   return AbsolutePath(ins.PerInstanceUdsPath("launcher_monitor.sock"));

base/cvd/cuttlefish/host/libs/config/config_instance_derived.h

@@ -29,6 +29,7 @@ std::string ConsolePipePrefix(const CuttlefishConfig::InstanceSpecific&);
 std::string GamepadSocketPath(const CuttlefishConfig::InstanceSpecific&);
 std::string HwcomposerPmemPath(const CuttlefishConfig::InstanceSpecific&);
 std::string KernelLogPipeName(const CuttlefishConfig::InstanceSpecific& ins);
+std::string KeyboardSocketPath(const CuttlefishConfig::InstanceSpecific&);
 std::string LauncherMonitorSocketPath(
     const CuttlefishConfig::InstanceSpecific&);
 std::string LogcatPath(const CuttlefishConfig::InstanceSpecific&);

base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h

@@ -352,7 +352,6 @@ class CuttlefishConfig {
     std::string instance_internal_uds_dir() const;
 
     std::string touch_socket_path(int touch_dev_idx) const;
-    std::string keyboard_socket_path() const;
     std::string switches_socket_path() const;
 
     std::string launcher_log_path() const;

base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp

@@ -1848,10 +1848,6 @@ std::string CuttlefishConfig::InstanceSpecific::touch_socket_path(
   return PerInstanceInternalUdsPath(name);
 }
 
-std::string CuttlefishConfig::InstanceSpecific::keyboard_socket_path() const {
-  return PerInstanceInternalUdsPath("keyboard.sock");
-}
-
 std::string CuttlefishConfig::InstanceSpecific::switches_socket_path() const {
   return PerInstanceInternalUdsPath("switches.sock");
 }

base/cvd/cuttlefish/host/libs/vm_manager/crosvm_manager.cpp

@@ -654,7 +654,7 @@ Result<std::vector<MonitorCommand>> CrosvmManager::StartCommands(
       crosvm_cmd.AddVhostUser("input", GamepadSocketPath(instance));
     }
     crosvm_cmd.AddVhostUser("input", RotarySocketPath(instance));
-    crosvm_cmd.AddVhostUser("input", instance.keyboard_socket_path());
+    crosvm_cmd.AddVhostUser("input", KeyboardSocketPath(instance));
     crosvm_cmd.AddVhostUser("input", instance.switches_socket_path());
   }