Revert of Video capture Android: enable unittests for Camera2 API

media/capture/video/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/capture/video/android/video_capture_device_factory_android.h"
 
 #include <utility>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
@@ skipping 23 matching lines @@
 VideoCaptureDeviceFactoryAndroid::CreateDevice(
     const VideoCaptureDeviceDescriptor& device_descriptor) {
   DCHECK(thread_checker_.CalledOnValidThread());
   int id;
   if (!base::StringToInt(device_descriptor.device_id, &id))
     return std::unique_ptr<VideoCaptureDevice>();
 
   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(
     VideoCaptureDeviceDescriptors* device_descriptors) {
   DCHECK(thread_checker_.CalledOnValidThread());
   device_descriptors->clear();
 
   JNIEnv* env = AttachCurrentThread();
 
   const JavaRef<jobject>& context = base::android::GetApplicationContext();
@@ skipping 39 matching lines @@
       Java_VideoCaptureFactory_getDeviceSupportedFormats(
           env, base::android::GetApplicationContext(), id);
   if (collected_formats.is_null())
     return;
 
   jsize num_formats = env->GetArrayLength(collected_formats.obj());
   for (int i = 0; i < num_formats; ++i) {
     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:
         pixel_format = media::PIXEL_FORMAT_YV12;
         break;
       case VideoCaptureDeviceAndroid::ANDROID_IMAGE_FORMAT_NV21:
         pixel_format = media::PIXEL_FORMAT_NV21;
         break;
       default:
-        // VideoCaptureCamera2 doesn't know the provided format until capture.
-        break;
+        continue;
     }
     VideoCaptureFormat capture_format(
         gfx::Size(
             media::Java_VideoCaptureFactory_getCaptureFormatWidth(env, format),
             media::Java_VideoCaptureFactory_getCaptureFormatHeight(env,
                                                                    format)),
         media::Java_VideoCaptureFactory_getCaptureFormatFramerate(env, format),
         pixel_format);
     capture_formats->push_back(capture_format);
     DVLOG(1) << device.display_name << " "
              << VideoCaptureFormat::ToString(capture_format);
   }
 }
 
-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(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   return new VideoCaptureDeviceFactoryAndroid();
 }
 
 }  // namespace media