Improve MidiManagerAlsa manufacturer reporting

media/midi/midi_manager_alsa.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MIDI_MIDI_MANAGER_ALSA_H_
 #define MEDIA_MIDI_MIDI_MANAGER_ALSA_H_
 
 #include <alsa/asoundlib.h>
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "media/midi/midi_manager.h"
 
+#if defined(USE_UDEV)

[Ryan Sleevi, 2015/03/04 19:46:56]

Yes, this is fine because it's forced into the entire tree by
//build/common.gypi

+#include "device/udev_linux/scoped_udev.h"
+#endif  // defined(USE_UDEV)
+
 namespace media {
 
-class MidiManagerAlsa : public MidiManager {
+namespace internal {
+
+// Decodes just \xXX in strings.
+MEDIA_EXPORT_PRIVATE std::string UnescapeUdev(const std::string& s);

[Takashi Toyoshima, 2015/03/04 09:33:37]

Do you have any reason to place these two functions out side MidiManagerAlsa
class, and inside a special namespace with MEDIA_EXPORT_PRIVATE?

How about having them as private methods and using FRIEND_TEST_ALL_PREFIXES to
make them accessible from you tests?

[wolenetz, 2015/03/04 19:28:58]

+1. I'm not fully conversant with the pros/cons here, but ISTM that adding a new
way of exporting test-only-visible media functionality for just these 2
functions is inconsistent with other test-only methods in media that are private
and accessible by tests as friends.

[Adam Goode, 2015/03/04 19:59:18]

Done.

+
+// Extracts the manufacturer using heuristics and a variety of sources.
+MEDIA_EXPORT_PRIVATE std::string ExtractManufacturer(
+    const std::string& udev_id_vendor_enc,
+    const std::string& udev_id_vendor_id,
+    const std::string& udev_id_vendor_from_database,
+    const std::string& alsa_name,
+    const std::string& alsa_longname);
+
+}  // namespace internal
+
+class MEDIA_EXPORT MidiManagerAlsa : public MidiManager {
  public:
   MidiManagerAlsa();
   ~MidiManagerAlsa() override;
 
   // MidiManager implementation.
   void StartInitialization() override;
   void DispatchSendMidiData(MidiManagerClient* client,
                             uint32 port_index,
                             const std::vector<uint8>& data,
                             double timestamp) override;
@@ skipping 17 matching lines @@
 
   // Mapping from Alsa client:port to our index.
   typedef std::map<int, uint32> SourceMap;
   SourceMap source_map_;
 
   // Alsa event <-> MIDI coders.
   snd_midi_event_t* decoder_;
   typedef std::vector<snd_midi_event_t*> EncoderList;
   EncoderList encoders_;
 
+  // udev, for querying hardware devices.
+#if defined(USE_UDEV)
+  device::ScopedUdevPtr udev_;
+#endif  // defined(USE_UDEV)
+
   base::Thread send_thread_;
   base::Thread event_thread_;
 
   bool event_thread_shutdown_; // guarded by shutdown_lock_
   base::Lock shutdown_lock_; // guards event_thread_shutdown_
 
   DISALLOW_COPY_AND_ASSIGN(MidiManagerAlsa);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MIDI_MIDI_MANAGER_ALSA_H_