Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/win/video_capture_device_win.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.
 
 // Windows specific implementation of VideoCaptureDevice. DirectShow is used for
 // capturing. DirectShow provide its own threads for capturing.
 
 #ifndef MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
 #define MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
 
@@ skipping 46 matching lines @@
 
   static HRESULT GetDeviceFilter(const std::string& device_id,
                                  IBaseFilter** filter);
   static base::win::ScopedComPtr<IPin> GetPin(IBaseFilter* filter,
                                               PIN_DIRECTION pin_dir,
                                               REFGUID category,
                                               REFGUID major_type);
   static VideoPixelFormat TranslateMediaSubtypeToPixelFormat(
       const GUID& sub_type);
 
-  explicit VideoCaptureDeviceWin(const Name& device_name);
+  explicit VideoCaptureDeviceWin(
+      const VideoCaptureDeviceDescriptor& device_descriptor);
   ~VideoCaptureDeviceWin() override;
   // Opens the device driver for this device.
   bool Init();
 
   // VideoCaptureDevice implementation.
   void AllocateAndStart(
       const VideoCaptureParams& params,
       std::unique_ptr<VideoCaptureDevice::Client> client) override;
   void StopAndDeAllocate() override;
 
  private:
   enum InternalState {
     kIdle,       // The device driver is opened but camera is not in use.
     kCapturing,  // Video is being captured.
     kError       // Error accessing HW functions.
                  // User needs to recover by destroying the object.
   };
 
   // Implements SinkFilterObserver.
   void FrameReceived(const uint8_t* buffer,
                      int length,
                      base::TimeDelta timestamp) override;
 
   bool CreateCapabilityMap();
   void SetAntiFlickerInCaptureFilter(const VideoCaptureParams& params);
   void SetErrorState(const tracked_objects::Location& from_here,
                      const std::string& reason);
 
-  const Name device_name_;
+  const VideoCaptureDeviceDescriptor device_descriptor_;
   InternalState state_;
   std::unique_ptr<VideoCaptureDevice::Client> client_;
 
   base::win::ScopedComPtr<IBaseFilter> capture_filter_;
 
   base::win::ScopedComPtr<IGraphBuilder> graph_builder_;
   base::win::ScopedComPtr<ICaptureGraphBuilder2> capture_graph_builder_;
 
   base::win::ScopedComPtr<IMediaControl> media_control_;
   base::win::ScopedComPtr<IPin> input_sink_pin_;
   base::win::ScopedComPtr<IPin> output_capture_pin_;
 
   scoped_refptr<SinkFilter> sink_filter_;
 
   // Map of all capabilities this device support.
   CapabilityList capabilities_;
   VideoCaptureFormat capture_format_;
 
   base::TimeTicks first_ref_time_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_