Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/android/video_capture_device_android.cc

Index: media/capture/video/android/video_capture_device_android.cc
diff --git a/media/capture/video/android/video_capture_device_android.cc b/media/capture/video/android/video_capture_device_android.cc
index 715f8f4c966eacb91e7d918024e9b8191f127d03..16d8b5c9ac2696adc4c7e92aff06eb69c6aca8a7 100644
--- a/media/capture/video/android/video_capture_device_android.cc
+++ b/media/capture/video/android/video_capture_device_android.cc
@@ -31,16 +31,11 @@ bool VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-const std::string VideoCaptureDevice::Name::GetModel() const {
-  // Android cameras are not typically USB devices, and this method is currently
-  // only used for USB model identifiers, so this implementation just indicates
-  // an unknown device model.
-  return "";
-}
-
-VideoCaptureDeviceAndroid::VideoCaptureDeviceAndroid(const Name& device_name)
-    : state_(kIdle), got_first_frame_(false), device_name_(device_name) {
-}
+VideoCaptureDeviceAndroid::VideoCaptureDeviceAndroid(
+    const VideoCaptureDeviceDescriptor& device_descriptor)
+    : state_(kIdle),
+      got_first_frame_(false),
+      device_descriptor_(device_descriptor) {}
 
 VideoCaptureDeviceAndroid::~VideoCaptureDeviceAndroid() {
   StopAndDeAllocate();
@@ -48,7 +43,7 @@ VideoCaptureDeviceAndroid::~VideoCaptureDeviceAndroid() {
 
 bool VideoCaptureDeviceAndroid::Init() {
   int id;
-  if (!base::StringToInt(device_name_.id(), &id))
+  if (!base::StringToInt(device_descriptor_.device_id, &id))
     return false;
 
   j_capture_.Reset(VideoCaptureDeviceFactoryAndroid::createVideoCaptureAndroid(