Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/android/video_capture_device_android.h

 // Copyright (c) 2013 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_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
 #define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 
@@ skipping 23 matching lines @@
   // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media
   enum AndroidImageFormat {
     // Android graphics ImageFormat mapping, see reference in:
     // http://developer.android.com/reference/android/graphics/ImageFormat.html
     ANDROID_IMAGE_FORMAT_NV21 = 17,
     ANDROID_IMAGE_FORMAT_YUV_420_888 = 35,
     ANDROID_IMAGE_FORMAT_YV12 = 842094169,
     ANDROID_IMAGE_FORMAT_UNKNOWN = 0,
   };
 
-  explicit VideoCaptureDeviceAndroid(const Name& device_name);
+  explicit VideoCaptureDeviceAndroid(
+      const VideoCaptureDeviceDescriptor& device_descriptor);
   ~VideoCaptureDeviceAndroid() override;
 
-  static VideoCaptureDevice* Create(const Name& device_name);
+  static VideoCaptureDevice* Create(
+      const VideoCaptureDeviceDescriptor& device_descriptor);
   static bool RegisterVideoCaptureDevice(JNIEnv* env);
 
   // Registers the Java VideoCaptureDevice pointer, used by the rest of the
   // methods of the class to operate the Java capture code. This method must be
   // called after the class constructor and before AllocateAndStart().
   bool Init();
 
   // VideoCaptureDevice implementation.
   void AllocateAndStart(const VideoCaptureParams& params,
                         std::unique_ptr<Client> client) override;
@@ skipping 54 matching lines @@
   base::TimeTicks first_ref_time_;
   base::TimeDelta frame_interval_;
   std::unique_ptr<VideoCaptureDevice::Client> client_;
 
   // List of |photo_callbacks_| in flight, being served in Java side.
   base::Lock photo_callbacks_lock_;
   std::list<std::unique_ptr<TakePhotoCallback>> photo_callbacks_;
 
   gfx::Size next_photo_resolution_;
 
-  Name device_name_;
+  VideoCaptureDeviceDescriptor device_descriptor_;

[mcasas, 2016/07/26 23:52:03]

nit: can be made const?

[chfremer, 2016/07/27 23:10:17]

Done.

   VideoCaptureFormat capture_format_;
 
   // Java VideoCaptureAndroid instance.
   base::android::ScopedJavaLocalRef<jobject> j_capture_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_