Android Video Capture: Removed references to Android.Hardware.Camera from the factory and cleanup

media/video/capture/android/video_capture_device_factory_android.cc

 // 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.
 
 #include "media/video/capture/android/video_capture_device_factory_android.h"
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 40 matching lines @@
   return scoped_ptr<VideoCaptureDevice>();
 }
 
 void VideoCaptureDeviceFactoryAndroid::GetDeviceNames(
     VideoCaptureDevice::Names* device_names) {
   DCHECK(thread_checker_.CalledOnValidThread());
   device_names->clear();
 
   JNIEnv* env = AttachCurrentThread();
 
-  int num_cameras = Java_ChromiumCameraInfo_getNumberOfCameras(
+  int num_cameras = Java_VideoCaptureFactory_getNumberOfCameras(
       env, base::android::GetApplicationContext());
   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);
-
     VideoCaptureDevice::Name name(
         base::android::ConvertJavaStringToUTF8(
-            Java_ChromiumCameraInfo_getDeviceName(env, ci.obj())),
-        base::StringPrintf("%d", Java_ChromiumCameraInfo_getId(env, ci.obj())));
+            Java_VideoCaptureFactory_getDeviceName(env, camera_id)),
+        base::android::ConvertJavaStringToUTF8(
+            Java_VideoCaptureFactory_getDeviceId(env, camera_id)));
     device_names->push_back(name);
 
-    DVLOG(1) << "VideoCaptureDeviceFactoryAndroid::GetDeviceNames: camera"
-             << "device_name=" << name.name() << ", unique_id=" << name.id()
-             << ", orientation "
-             << Java_ChromiumCameraInfo_getOrientation(env, ci.obj());
+    DVLOG(1) << "VideoCaptureDeviceFactoryAndroid::GetDeviceNames: camera "
+             << "device_name=" << name.name() << ", unique_id=" << name.id();
   }
 }
 
 void VideoCaptureDeviceFactoryAndroid::GetDeviceSupportedFormats(
     const VideoCaptureDevice::Name& device,
     VideoCaptureFormats* capture_formats) {
   DCHECK(thread_checker_.CalledOnValidThread());
   int id;
   if (!base::StringToInt(device.id(), &id))
     return;
@@ skipping 27 matching lines @@
                       format.obj())),
         media::Java_VideoCaptureFactory_getCaptureFormatFramerate(env,
                                                                   format.obj()),
         pixel_format);
     capture_formats->push_back(capture_format);
     DVLOG(1) << device.name() << " " << capture_format.ToString();
   }
 }
 
 }  // namespace media