Move switches_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

@@ -296,7 +296,7 @@ class VhostInputDevices : public CommandSource,
         CF_EXPECT(NewDeviceSockets(KeyboardSocketPath(instance_)),
                   "Failed to setup sockets for keyboard device");
     switches_sockets_ =
-        CF_EXPECT(NewDeviceSockets(instance_.switches_socket_path()),
+        CF_EXPECT(NewDeviceSockets(SwitchesSocketPath(instance_)),
                   "Failed to setup sockets for switches device");
     touchscreen_sockets_.reserve(instance_.display_configs().size());
     for (int i = 0; i < instance_.display_configs().size(); ++i) {

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

@@ -87,6 +87,10 @@ std::string RotarySocketPath(const CuttlefishConfig::InstanceSpecific& ins) {
   return ins.PerInstanceInternalUdsPath("rotary.sock");
 }
 
+std::string SwitchesSocketPath(const CuttlefishConfig::InstanceSpecific& ins) {
+  return ins.PerInstanceInternalUdsPath("switches.sock");
+}
+
 std::string RestoreAdbdPipeName(const CuttlefishConfig::InstanceSpecific& ins) {
   return AbsolutePath(ins.PerInstanceInternalPath("restore-pipe-adbd"));
 }

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

@@ -38,6 +38,7 @@ std::string MouseSocketPath(const CuttlefishConfig::InstanceSpecific&);
 std::string PflashPath(const CuttlefishConfig::InstanceSpecific&);
 std::string PstorePath(const CuttlefishConfig::InstanceSpecific&);
 std::string RotarySocketPath(const CuttlefishConfig::InstanceSpecific&);
+std::string SwitchesSocketPath(const CuttlefishConfig::InstanceSpecific&);
 std::string RestoreAdbdPipeName(const CuttlefishConfig::InstanceSpecific&);
 
 }  // namespace cuttlefish

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 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::switches_socket_path() const {
-  return PerInstanceInternalUdsPath("switches.sock");
-}
-
 static constexpr char kFrameSockPath[] = "frame_sock_path";
 void CuttlefishConfig::MutableInstanceSpecific::set_frames_socket_path(
     const std::string& frame_socket_path) {

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

@@ -655,7 +655,7 @@ Result<std::vector<MonitorCommand>> CrosvmManager::StartCommands(
     }
     crosvm_cmd.AddVhostUser("input", RotarySocketPath(instance));
     crosvm_cmd.AddVhostUser("input", KeyboardSocketPath(instance));
-    crosvm_cmd.AddVhostUser("input", instance.switches_socket_path());
+    crosvm_cmd.AddVhostUser("input", SwitchesSocketPath(instance));
   }
 
 #ifdef __linux__

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

@@ -762,7 +762,8 @@ Result<std::vector<MonitorCommand>> QemuManager::StartCommands(
 
   // device padding for unsupported "switches" input
   qemu_cmd.AddParameter("-chardev");
-  qemu_cmd.AddParameter("socket,path=", instance.switches_socket_path(), ",id=switches0");
+  qemu_cmd.AddParameter("socket,path=", SwitchesSocketPath(instance),
+                        ",id=switches0");
   qemu_cmd.AddParameter("-device");
   qemu_cmd.AddParameter("vhost-user-input-pci,chardev=switches0");