Revert of 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 b632a49bfe5872c0994e913cc4a19e5b1271938a..5fb751680683a3c58a1914c72f1a687b13b6a4bd 100644
--- a/media/capture/video/android/video_capture_device_factory_android.cc
+++ b/media/capture/video/android/video_capture_device_factory_android.cc
@@ -41,14 +41,11 @@
   std::unique_ptr<VideoCaptureDeviceAndroid> video_capture_device(
       new VideoCaptureDeviceAndroid(device_descriptor));
 
-  if (video_capture_device->Init()) {
-    if (test_mode_)
-      video_capture_device->ConfigureForTesting();
+  if (video_capture_device->Init())
     return std::move(video_capture_device);
-  }
 
   DLOG(ERROR) << "Error creating Video Capture Device.";
-  return nullptr;
+  return std::unique_ptr<VideoCaptureDevice>();
 }
 
 void VideoCaptureDeviceFactoryAndroid::GetDeviceDescriptors(
@@ -108,7 +105,8 @@
     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:
@@ -118,8 +116,7 @@
         pixel_format = media::PIXEL_FORMAT_NV21;
         break;
       default:
-        // VideoCaptureCamera2 doesn't know the provided format until capture.
-        break;
+        continue;
     }
     VideoCaptureFormat capture_format(
         gfx::Size(
@@ -134,15 +131,6 @@
   }
 }
 
-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(