Refactor the VideoCaptureDevice::Name struct.

media/video/capture/android/video_capture_device_android.cc

 // 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.
 
 #include "media/video/capture/android/video_capture_device_android.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 33 matching lines @@
 
   int num_cameras = Java_ChromiumCameraInfo_getNumberOfCameras(env);
   DVLOG(1) << "VideoCaptureDevice::GetDeviceNames: num_cameras=" << num_cameras;
   if (num_cameras <= 0)
     return;
 
   for (int camera_id = num_cameras - 1; camera_id >= 0; --camera_id) {
     ScopedJavaLocalRef<jobject> ci =
         Java_ChromiumCameraInfo_getAt(env, camera_id);
 
-    Name name;
-    name.unique_id = base::StringPrintf(
-        "%d", Java_ChromiumCameraInfo_getId(env, ci.obj()));
-    name.device_name = base::android::ConvertJavaStringToUTF8(
-        Java_ChromiumCameraInfo_getDeviceName(env, ci.obj()));
+    Name name(
+        base::android::ConvertJavaStringToUTF8(
+            Java_ChromiumCameraInfo_getDeviceName(env, ci.obj())),
+        base::StringPrintf("%d", Java_ChromiumCameraInfo_getId(env, ci.obj())));
     device_names->push_back(name);
 
     DVLOG(1) << "VideoCaptureDevice::GetDeviceNames: camera device_name="
-             << name.device_name
+             << name.name()
              << ", unique_id="
-             << name.unique_id
+             << name.id()
              << ", orientation "
              << Java_ChromiumCameraInfo_getOrientation(env, ci.obj());
   }
 }
 
 // static
 VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) {
   return VideoCaptureDeviceAndroid::Create(device_name);
 }
 
@@ skipping 17 matching lines @@
       device_name_(device_name),
       current_settings_() {
 }
 
 VideoCaptureDeviceAndroid::~VideoCaptureDeviceAndroid() {
   DeAllocate();
 }
 
 bool VideoCaptureDeviceAndroid::Init() {
   int id;
-  if (!base::StringToInt(device_name_.unique_id, &id))
+  if (!base::StringToInt(device_name_.id(), &id))
     return false;
 
   JNIEnv* env = AttachCurrentThread();
 
   j_capture_.Reset(Java_VideoCapture_createVideoCapture(
       env, base::android::GetApplicationContext(), id,
       reinterpret_cast<jint>(this)));
 
   return true;
 }
@@ skipping 142 matching lines @@
 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) {
   LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason;
   {
     base::AutoLock lock(lock_);
     state_ = kError;
   }
   observer_->OnError();
 }
 
 }  // namespace media