Reland: Video capture Android: enable unittests for Camera2 API

media/capture/video/android/video_capture_device_factory_android.cc

Index: media/capture/video/android/video_capture_device_factory_android.cc
diff --git a/media/capture/video/android/video_capture_device_factory_android.cc b/media/capture/video/android/video_capture_device_factory_android.cc
index 5fb751680683a3c58a1914c72f1a687b13b6a4bd..4998022c08d0c558e94105287563c4fd810ab711 100644
--- a/media/capture/video/android/video_capture_device_factory_android.cc
+++ b/media/capture/video/android/video_capture_device_factory_android.cc
@@ -41,11 +41,14 @@ VideoCaptureDeviceFactoryAndroid::CreateDevice(
   std::unique_ptr<VideoCaptureDeviceAndroid> video_capture_device(
       new VideoCaptureDeviceAndroid(device_descriptor));
 
-  if (video_capture_device->Init())
+  if (video_capture_device->Init()) {
+    if (test_mode_)
+      video_capture_device->ConfigureForTesting();
     return std::move(video_capture_device);
+  }
 
   DLOG(ERROR) << "Error creating Video Capture Device.";
-  return std::unique_ptr<VideoCaptureDevice>();
+  return nullptr;
 }
 
 void VideoCaptureDeviceFactoryAndroid::GetDeviceDescriptors(
@@ -105,8 +108,7 @@ void VideoCaptureDeviceFactoryAndroid::GetSupportedFormats(
     base::android::ScopedJavaLocalRef<jobject> format(
         env, env->GetObjectArrayElement(collected_formats.obj(), i));
 
-    VideoPixelFormat pixel_format =
-        media::PIXEL_FORMAT_UNKNOWN;
+    VideoPixelFormat pixel_format = media::PIXEL_FORMAT_UNKNOWN;
     switch (media::Java_VideoCaptureFactory_getCaptureFormatPixelFormat(
         env, format)) {
       case VideoCaptureDeviceAndroid::ANDROID_IMAGE_FORMAT_YV12:
@@ -116,6 +118,9 @@ void VideoCaptureDeviceFactoryAndroid::GetSupportedFormats(
         pixel_format = media::PIXEL_FORMAT_NV21;
         break;
       default:
+        // TODO(mcasas): break here and let the enumeration continue with
+        // UNKNOWN pixel format because the platform doesn't know until capture,
+        // but some unrelated tests timeout https://crbug.com/644910.
         continue;
     }
     VideoCaptureFormat capture_format(
@@ -131,6 +136,15 @@ void VideoCaptureDeviceFactoryAndroid::GetSupportedFormats(
   }
 }
 
+bool VideoCaptureDeviceFactoryAndroid::IsLegacyOrDeprecatedDevice(
+    const std::string& device_id) {
+  int id;
+  if (!base::StringToInt(device_id, &id))
+    return true;
+  return (Java_VideoCaptureFactory_isLegacyOrDeprecatedDevice(
+      AttachCurrentThread(), base::android::GetApplicationContext(), id));
+}
+
 // static
 VideoCaptureDeviceFactory*
 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(