Refactor the VideoCaptureDevice::Name struct.

media/video/capture/video_capture_device.h

 // Copyright (c) 2012 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.
 //
 // VideoCaptureDevice is the abstract base class for realizing video capture
 // device support in Chromium. It provides the interface for OS dependent
 // implementations.
 // The class is created and functions are invoked on a thread owned by
 // VideoCaptureManager. Capturing is done on other threads, depending on the OS
 // specific implementation.
 
 #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_
 #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_
 
 #include <list>
 #include <string>
 
 #include "base/time.h"
 #include "media/base/media_export.h"
 #include "media/video/capture/video_capture_types.h"
 
 namespace media {
 
 class MEDIA_EXPORT VideoCaptureDevice {
  public:
+  // Represents a capture device name and ID.
+  // You should not create an instance of this class directly by e.g. setting
+  // various properties directly.  Instead use
+  // VideoCaptureDevice::GetDeviceNames to do this for you and if you need to
+  // cache your own copy of a name, you can do so via the copy constructor.
+  // The reason for this is that a device name might contain platform specific
+  // settings that are relevant only to the platform specific implementation of
+  // VideoCaptureDevice::Create.
+  class Name {
+   public:
+    Name() {}
+    Name(const std::string& name, const std::string& id)
+        : device_name_(name), unique_id_(id) {}
+    ~Name() {}
 
-  struct Name {
     // Friendly name of a device
-    std::string device_name;
+    const std::string& name() const { return device_name_; }
 
     // Unique name of a device. Even if there are multiple devices with the same
     // friendly name connected to the computer this will be unique.
-    std::string unique_id;
+    const std::string& id() const { return unique_id_; }
+
+    // These operators are needed due to storing the name in an STL container.
+    // In the shared build, all methods from the STL container will be exported
+    // so even though they're not used, they're still depended upon.
+    bool operator==(const Name& other) const {
+      return other.id() == unique_id_ && other.name() == device_name_;
+    }
+    bool operator<(const Name& other) const {
+      return unique_id_ < other.id();
+    }
+
+   private:
+    std::string device_name_;
+    std::string unique_id_;
+    // Allow generated copy constructor and assignment.
   };
-  typedef std::list<Name> Names;
+
+  // Manages a list of Name entries.
+  class MEDIA_EXPORT Names
+      : public NON_EXPORTED_BASE(std::list<Name>) {
+   public:
+    // Returns NULL if no entry was found by that ID.
+    Name* FindById(const std::string& id);
+
+    // Allow generated copy constructor and assignment.
+  };
 
   class MEDIA_EXPORT EventHandler {
    public:
 
     // Reserve an output buffer into which a video frame can be captured
     // directly. If all buffers are currently busy, returns NULL.
     //
     // The returned VideoFrames will always be allocated with a YV12 format. The
     // size will match that specified by an earlier call to OnFrameInfo. It is
     // the VideoCaptureDevice's responsibility to obey whatever stride and
@@ skipping 87 matching lines @@
   // not permitted to make any additional calls to its EventHandler.
   virtual void DeAllocate() = 0;
 
   // Get the name of the capture device.
   virtual const Name& device_name() = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_