Revert of Video capture Android: enable unittests for Camera2 API

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

Index: media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java
diff --git a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java
index 08ef0b8b4d3737cde6a2e0a5ba2c547a62f693b9..a1d2867fc759eb526b5db337726adbf35f02d733 100644
--- a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java
+++ b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java
@@ -242,7 +242,6 @@
     private CameraDevice mCameraDevice;
     private CameraCaptureSession mPreviewSession;
     private CaptureRequest mPreviewRequest;
-    private Handler mMainHandler = null;
 
     private CameraState mCameraState = CameraState.STOPPED;
     private final float mMaxZoom;
@@ -456,7 +455,8 @@
         try {
             return manager.getCameraIdList().length;
         } catch (CameraAccessException | SecurityException ex) {
-            // SecurityException is undocumented but seen in the wild: https://crbug/605424.
+            // SecurityException is an undocumented exception, but has been seen in
+            // http://crbug/605424.
             Log.e(TAG, "getNumberOfCameras: getCameraIdList(): ", ex);
             return 0;
         }
@@ -584,20 +584,10 @@
         changeCameraStateAndNotify(CameraState.OPENING);
         final CameraManager manager =
                 (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);
-
-        if (!mUseBackgroundThreadForTesting) {
-            mMainHandler = new Handler(mContext.getMainLooper());
-        } else {
-            // Usually we deliver frames on |mContext|s thread, but unit tests
-            // occupy its Looper; deliver frames on a background thread instead.
-            HandlerThread thread = new HandlerThread("CameraPicture");
-            thread.start();
-            mMainHandler = new Handler(thread.getLooper());
-        }
-
+        final Handler mainHandler = new Handler(mContext.getMainLooper());
         final CrStateListener stateListener = new CrStateListener();
         try {
-            manager.openCamera(Integer.toString(mId), stateListener, mMainHandler);
+            manager.openCamera(Integer.toString(mId), stateListener, mainHandler);
         } catch (CameraAccessException | IllegalArgumentException | SecurityException ex) {
             Log.e(TAG, "allocate: manager.openCamera: ", ex);
             return false;
@@ -632,9 +622,6 @@
         }
         if (mCameraDevice == null) return false;
         mCameraDevice.close();
-
-        if (mUseBackgroundThreadForTesting) mMainHandler.getLooper().quit();
-
         changeCameraStateAndNotify(CameraState.STOPPED);
         mCropRect = new Rect();
         return true;