cvd: Move CanHandle out of CvdCommandHandler

All commands were using the same implementation which was just checking
against the command list anyways.

Author: jemoreira

base/cvd/cuttlefish/host/commands/cvd/cli/commands/bugreport.cpp

@@ -111,8 +111,6 @@ CvdBugreportCommandHandler::CvdBugreportCommandHandler(
     : instance_manager_(instance_manager) {}
 
 Result<void> CvdBugreportCommandHandler::Handle(const CommandRequest& request) {
-  CF_EXPECT(CanHandle(request));
-
   std::vector<std::string> cmd_args = request.SubcommandArguments();
   cvd_common::Envs env = request.Env();
 

base/cvd/cuttlefish/host/commands/cvd/cli/commands/cache.cpp

@@ -105,8 +105,6 @@ class CvdCacheCommandHandler : public CvdCommandHandler {
 };
 
 Result<void> CvdCacheCommandHandler::Handle(const CommandRequest& request) {
-  CF_EXPECT(CanHandle(request));
-
   CacheArguments arguments =
       CF_EXPECT(ProcessArguments(request.SubcommandArguments()));
   std::string cache_directory = PerUserCacheDir();

base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.cpp

@@ -54,7 +54,6 @@ CvdClearCommandHandler::CvdClearCommandHandler(
     : instance_manager_(instance_manager) {}
 
 Result<void> CvdClearCommandHandler::Handle(const CommandRequest& request) {
-  CF_EXPECT(CanHandle(request));
   std::vector<std::string> args = request.SubcommandArguments();
   CF_EXPECT(ConsumeFlags({UnexpectedArgumentGuard()}, args));
   CF_EXPECT(instance_manager_.Clear());

base/cvd/cuttlefish/host/commands/cvd/cli/commands/command_handler.cpp

@@ -16,16 +16,8 @@
 
 #include "cuttlefish/host/commands/cvd/cli/commands/command_handler.h"
 
-#include "cuttlefish/common/libs/utils/contains.h"
-#include "cuttlefish/host/commands/cvd/cli/command_request.h"
-#include "cuttlefish/result/result.h"
-
 namespace cuttlefish {
 
-Result<bool> CvdCommandHandler::CanHandle(const CommandRequest& request) const {
-  return Contains(CmdList(), request.Subcommand());
-}
-
 bool CvdCommandHandler::RequiresDeviceExists() const { return false; }
 
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/cvd/cli/commands/command_handler.h

@@ -28,7 +28,6 @@ class CvdCommandHandler {
  public:
   virtual ~CvdCommandHandler() = default;
 
-  virtual Result<bool> CanHandle(const CommandRequest&) const;
   virtual Result<void> Handle(const CommandRequest&) = 0;
   // returns the list of subcommand it can handle
   virtual cvd_common::Args CmdList() const = 0;

base/cvd/cuttlefish/host/commands/cvd/cli/commands/create.cpp

@@ -289,10 +289,8 @@ Result<void> CvdCreateCommandHandler::CreateSymlinks(
 }
 
 Result<void> CvdCreateCommandHandler::Handle(const CommandRequest& request) {
-  CF_EXPECT(CanHandle(request));
   std::vector<std::string> subcmd_args = request.SubcommandArguments();
 
-
   cvd_common::Envs envs = CF_EXPECT(GetEnvs(request));
   CreateFlags flags = CF_EXPECT(ParseCommandFlags(envs, subcmd_args));
 

base/cvd/cuttlefish/host/commands/cvd/cli/commands/display.cpp

@@ -65,7 +65,6 @@ class CvdDisplayCommandHandler : public CvdCommandHandler {
       : instance_manager_{instance_manager} {}
 
   Result<void> Handle(const CommandRequest& request) override {
-    CF_EXPECT(CanHandle(request));
     const cvd_common::Envs& env = request.Env();
 
     std::vector<std::string> subcmd_args = request.SubcommandArguments();

base/cvd/cuttlefish/host/commands/cvd/cli/commands/env.cpp

@@ -57,7 +57,6 @@ class CvdEnvCommandHandler : public CvdCommandHandler {
       : instance_manager_{instance_manager} {}
 
   Result<void> Handle(const CommandRequest& request) override {
-    CF_EXPECT(CanHandle(request));
     std::vector<std::string> subcmd_args = request.SubcommandArguments();
 
     // --help and cvd env help are intercepted

base/cvd/cuttlefish/host/commands/cvd/cli/commands/fetch.cpp

@@ -91,8 +91,6 @@ Result<void> RunCacheCleanup(const BuildApiFlags& build_api_flags) {
 }
 
 Result<void> CvdFetchCommandHandler::Handle(const CommandRequest& request) {
-  CF_EXPECT(CanHandle(request));
-
   std::vector<std::string> args = request.SubcommandArguments();
   const FetchFlags flags = CF_EXPECT(FetchFlags::Parse(args));
   CF_EXPECT(EnsureDirectoryExists(flags.target_directory));

base/cvd/cuttlefish/host/commands/cvd/cli/commands/fleet.cpp

@@ -67,8 +67,6 @@ class CvdFleetCommandHandler : public CvdCommandHandler {
 };
 
 Result<void> CvdFleetCommandHandler::Handle(const CommandRequest& request) {
-  CF_EXPECT(CanHandle(request));
-
   std::vector<std::string> args = request.SubcommandArguments();
   CF_EXPECT(ConsumeFlags({UnexpectedArgumentGuard()}, args));