Refactor the VideoCaptureDevice::Name struct.

content/browser/renderer_host/media/video_capture_manager.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.
 
 // VideoCaptureManager is used to open/close, start/stop, enumerate available
 // video capture devices, and manage VideoCaptureController's.
 // All functions are expected to be called from Browser::IO thread.
 // VideoCaptureManager will open OS dependent instances of VideoCaptureDevice.
 // A device can only be opened once.
 
@@ skipping 126 matching lines @@
   // Only accessed from device thread.
   // VideoCaptureManager owns all VideoCaptureDevices and is responsible for
   // deleting the instances when they are not used any longer.
   struct DeviceEntry {
     MediaStreamType stream_type;
     media::VideoCaptureDevice* capture_device;  // Maybe shared across sessions.
   };
   typedef std::map<int, DeviceEntry> VideoCaptureDevices;
   VideoCaptureDevices devices_;  // Maps capture_session_id to DeviceEntry.
 
-  // Set to true if using fake devices for testing, false by default.
+  // Set to true if using fake video capture devices for testing,
+  // false by default.  This is only used for the MEDIA_DEVICE_VIDEO_CAPTURE
+  // device type.
   bool use_fake_device_;
 
   // Only accessed from device thread.
   // VideoCaptureManager owns all VideoCaptureController's and is responsible
   // for deleting the instances when they are not used any longer.
   // VideoCaptureDevice is one-to-one mapped to VideoCaptureController.
   typedef std::map<media::VideoCaptureDevice*, Controller*> Controllers;
   Controllers controllers_;
 
+  // We cache the enumerated video capture devices in GetAvailableDevices
+  // (e.g. called by OnEnumerateDevices) and then look up the requested ID when
+  // a device is opened (see OnOpen).
+  // Used only on the device thread.
+  media::VideoCaptureDevice::Names video_capture_devices_;
+
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_