Improve parser_names_test.cpp errors

Bug: b/389804379
Test: /usr/bin/bazel test '//...'

Author: Databean

base/cvd/cuttlefish/host/commands/cvd/unittests/selector/parser_names_helper.h

@@ -17,8 +17,6 @@
 
 #include <optional>
 #include <string>
-#include <unordered_map>
-#include <unordered_set>
 #include <vector>
 
 #include <gtest/gtest.h>

base/cvd/cuttlefish/host/commands/cvd/unittests/selector/parser_names_test.cpp

@@ -16,30 +16,33 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "common/libs/utils/result_matchers.h"
 #include "host/commands/cvd/unittests/selector/parser_names_helper.h"
 
 namespace cuttlefish {
 namespace selector {
 
 TEST_P(ValidNamesTest, ValidInputs) {
   auto selector_options_res = ParseCommonSelectorArguments(selector_args_);
-  ASSERT_TRUE(selector_options_res.ok());
+  ASSERT_THAT(selector_options_res, IsOk());
+
   auto parser = StartSelectorParser::ConductSelectFlagsParser(
       *selector_options_res, cvd_common::Args{}, cvd_common::Envs{});
 
-  ASSERT_TRUE(parser.ok());
+  ASSERT_THAT(parser, IsOk());
 }
 
 /**
  * Note that invalid inputs must be tested at the InstanceDatabase level
  */
 TEST_P(ValidNamesTest, FieldsNoSubstring) {
   auto selector_options_res = ParseCommonSelectorArguments(selector_args_);
-  ASSERT_TRUE(selector_options_res.ok());
+  ASSERT_THAT(selector_options_res, IsOk());
+
   auto parser = StartSelectorParser::ConductSelectFlagsParser(
       *selector_options_res, cvd_common::Args{}, cvd_common::Envs{});
 
-  ASSERT_TRUE(parser.ok());
+  ASSERT_THAT(parser, IsOk());
   ASSERT_EQ(parser->GroupName(), expected_output_.group_name);
   ASSERT_EQ(parser->PerInstanceNames(), expected_output_.per_instance_names);
 }