Rename CardInfo to MidiDevice and factor out some device probing logic

media/midi/midi_manager_alsa_unittest.cc

Index: media/midi/midi_manager_alsa_unittest.cc
diff --git a/media/midi/midi_manager_alsa_unittest.cc b/media/midi/midi_manager_alsa_unittest.cc
index 27248cca67ddfac518766d24314881165a62abdc..47789b6d60d471518fb34848ff2ceaf7e3090471 100644
--- a/media/midi/midi_manager_alsa_unittest.cc
+++ b/media/midi/midi_manager_alsa_unittest.cc
@@ -10,68 +10,39 @@ namespace media {
 
 TEST(MidiManagerAlsaTest, ExtractManufacturer) {
   ASSERT_EQ("My\\x20Vendor",
-            MidiManagerAlsa::CardInfo::ExtractManufacturerString(
-                "My\\x20Vendor",
-                "1234",
-                "My Vendor, Inc.",
-                "Card",
-                "My Vendor Inc Card at bus"));
-  ASSERT_EQ("My Vendor",
-            MidiManagerAlsa::CardInfo::ExtractManufacturerString(
-                "My Vendor",
-                "1234",
-                "My Vendor, Inc.",
-                "Card",
+            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+                "My\\x20Vendor", "1234", "My Vendor, Inc.", "Card",
                 "My Vendor Inc Card at bus"));
+  ASSERT_EQ("My Vendor", MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+                             "My Vendor", "1234", "My Vendor, Inc.", "Card",
+                             "My Vendor Inc Card at bus"));
   ASSERT_EQ("My Vendor, Inc.",
-            MidiManagerAlsa::CardInfo::ExtractManufacturerString(
-                "1234",
-                "1234",
-                "My Vendor, Inc.",
-                "Card",
+            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+                "1234", "1234", "My Vendor, Inc.", "Card",
                 "My Vendor Inc Card at bus"));
   ASSERT_EQ("My Vendor Inc",
-            MidiManagerAlsa::CardInfo::ExtractManufacturerString(
-                "1234",
-                "1234",
-                "",
-                "Card",
-                "My Vendor Inc Card at bus"));
+            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+                "1234", "1234", "", "Card", "My Vendor Inc Card at bus"));
   ASSERT_EQ("My Vendor Inc",
-            MidiManagerAlsa::CardInfo::ExtractManufacturerString(
-                "",
-                "",
-                "",
-                "Card",
-                "My Vendor Inc Card at bus"));
-  ASSERT_EQ("",
-            MidiManagerAlsa::CardInfo::ExtractManufacturerString("1234",
-                                                                 "1234",
-                                                                 "",
-                                                                 "Card",
-                                                                 "Longname"));
+            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+                "", "", "", "Card", "My Vendor Inc Card at bus"));
+  ASSERT_EQ("", MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+                    "1234", "1234", "", "Card", "Longname"));
   ASSERT_EQ("Keystation\\x20Mini\\x2032",
-            MidiManagerAlsa::CardInfo::ExtractManufacturerString(
-                "Keystation\\x20Mini\\x2032",
-                "129d",
-                "Evolution Electronics, Ltd",
-                "Keystation Mini 32",
+            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+                "Keystation\\x20Mini\\x2032", "129d",
+                "Evolution Electronics, Ltd", "Keystation Mini 32",
                 "Keystation Mini 32 Keystation Mini 32 at"
                 " usb-0000:00:14.0-2.4.4, full speed"));
   ASSERT_EQ("Keystation Mini 32",
-            MidiManagerAlsa::CardInfo::ExtractManufacturerString(
-                "Keystation Mini 32",
-                "129d",
-                "Evolution Electronics, Ltd",
+            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+                "Keystation Mini 32", "129d", "Evolution Electronics, Ltd",
                 "Keystation Mini 32",
                 "Keystation Mini 32 Keystation Mini 32 at"
                 " usb-0000:00:14.0-2.4.4, full speed"));
   ASSERT_EQ("Keystation Mini 32",
-            MidiManagerAlsa::CardInfo::ExtractManufacturerString(
-                "",
-                "",
-                "",
-                "Keystation Mini 32",
+            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+                "", "", "", "Keystation Mini 32",
                 "Keystation Mini 32 Keystation Mini 32 at"
                 " usb-0000:00:14.0-2.4.4, full speed"));
 }