Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/android/java/src/org/chromium/media/VideoCaptureAndroid.java

 // Copyright 2014 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.
 
 package org.chromium.media;
 
 import android.content.Context;
 import android.graphics.ImageFormat;
 
 import org.chromium.base.Log;
@@ skipping 32 matching lines @@
     private int mExpectedFrameSize;
     private static final int NUM_CAPTURE_BUFFERS = 3;
     private static final String TAG = "cr.media";
 
     static int getNumberOfCameras() {
         return android.hardware.Camera.getNumberOfCameras();
     }
 
     static int getCaptureApiType(int id) {
         if (VideoCaptureCamera.getCameraInfo(id) == null) {
-            return CaptureApiType.API_TYPE_UNKNOWN;
+            return VideoCaptureApiType.API_TYPE_UNKNOWN;
         }
-        return CaptureApiType.API1;
+        return VideoCaptureApiType.ANDROID_API1;
     }
 
     static String getName(int id) {
         android.hardware.Camera.CameraInfo cameraInfo = VideoCaptureCamera.getCameraInfo(id);
         if (cameraInfo == null) return null;
 
         return "camera " + id + ", facing "
                 + (cameraInfo.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT
                                   ? "front"
                                   : "back");
@@ skipping 99 matching lines @@
             mPreviewBufferLock.unlock();
             if (camera != null) {
                 camera.addCallbackBuffer(data);
             }
         }
     }
 
     // TODO(wjia): investigate whether reading from texture could give better
     // performance and frame rate, using onFrameAvailable().
 }