Revert of Shape Detection: Face detection junit tests

services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java

 // Copyright 2016 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.
 
 package org.chromium.shape_detection;
 
 import android.graphics.Bitmap;
 import android.graphics.PointF;
 import android.media.FaceDetector;
 import android.media.FaceDetector.Face;
 import android.os.AsyncTask;
 
 import org.chromium.base.Log;
-import org.chromium.base.VisibleForTesting;
 import org.chromium.gfx.mojom.RectF;
 import org.chromium.mojo.system.MojoException;
 import org.chromium.mojo.system.SharedBufferHandle;
 import org.chromium.mojo.system.SharedBufferHandle.MapFlags;
 import org.chromium.shape_detection.mojom.FaceDetection;
 import org.chromium.shape_detection.mojom.FaceDetectionResult;
 import org.chromium.shape_detection.mojom.FaceDetectorOptions;
 import org.chromium.shape_detection.mojom.Landmark;
 
 import java.nio.ByteBuffer;
 
 /**
  * Android implementation of the FaceDetection service defined in
  * services/shape_detection/public/interfaces/facedetection.mojom
  */
 public class FaceDetectionImpl implements FaceDetection {
     private static final String TAG = "FaceDetectionImpl";
     private static final int MAX_FACES = 32;
-    private static FaceDetector sFaceDetector;
     private final boolean mFastMode;
     private final int mMaxFaces;
 
     FaceDetectionImpl(FaceDetectorOptions options) {
         mFastMode = options.fastMode;
         mMaxFaces = Math.min(options.maxDetectedFaces, MAX_FACES);
     }
 
-    @VisibleForTesting
-    public static void setFaceDetector(FaceDetector faceDetector) {
-        sFaceDetector = faceDetector;
-    }
-
     @Override
     public void detect(SharedBufferHandle frameData, final int width, final int height,
             final DetectResponse callback) {
         final long numPixels = (long) width * height;
         // TODO(xianglu): https://crbug.com/670028 homogeneize overflow checking.
         if (!frameData.isValid() || width <= 0 || height <= 0 || numPixels > (Long.MAX_VALUE / 4)) {
             Log.d(TAG, "Invalid argument(s).");
             callback.call(new FaceDetectionResult[0]);
             return;
         }
 
         ByteBuffer imageBuffer = frameData.map(0, numPixels * 4, MapFlags.none());
         if (imageBuffer.capacity() <= 0) {
             Log.d(TAG, "Failed to map from SharedBufferHandle.");
             callback.call(new FaceDetectionResult[0]);
             return;
         }
 
         Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
 
         // An int array is needed to construct a Bitmap. However the Bytebuffer
         // we get from |sharedBufferHandle| is directly allocated and does not
         // have a supporting array. Therefore we need to copy from |imageBuffer|
         // to create this intermediate Bitmap.
         // TODO(xianglu): Consider worker pool as appropriate threads.
         // http://crbug.com/655814
-        try {
-            bitmap.copyPixelsFromBuffer(imageBuffer);
-        } catch (RuntimeException e) {
-            callback.call(new FaceDetectionResult[0]);
-            return;
-        }
+        bitmap.copyPixelsFromBuffer(imageBuffer);
 
         // A Bitmap must be in 565 format for findFaces() to work. See
         // http://androidxref.com/7.0.0_r1/xref/frameworks/base/media/java/android/media/FaceDetector.java#124
         //
         // It turns out that FaceDetector is not able to detect correctly if
         // simply using pixmap.setConfig(). The reason might be that findFaces()
         // needs non-premultiplied ARGB arrangement, while the alpha type in the
         // original image is premultiplied. We can use getPixels() which does
         // the unmultiplication while copying to a new array. See
         // http://androidxref.com/7.0.0_r1/xref/frameworks/base/graphics/java/android/graphics/Bitmap.java#538
         int[] pixels = new int[width * height];
         bitmap.getPixels(pixels, 0, width, 0, 0, width, height);
         final Bitmap unPremultipliedBitmap =
                 Bitmap.createBitmap(pixels, width, height, Bitmap.Config.RGB_565);
 
         // FaceDetector creation and findFaces() might take a long time and trigger a
         // "StrictMode policy violation": they should happen in a background thread.
         AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {
             @Override
             public void run() {
-                final FaceDetector detector = (sFaceDetector != null)
-                        ? sFaceDetector
-                        : new FaceDetector(width, height, mMaxFaces);
+                final FaceDetector detector = new FaceDetector(width, height, mMaxFaces);
                 Face[] detectedFaces = new Face[mMaxFaces];
                 // findFaces() will stop at |mMaxFaces|.
                 final int numberOfFaces = detector.findFaces(unPremultipliedBitmap, detectedFaces);
 
                 FaceDetectionResult[] faceArray = new FaceDetectionResult[numberOfFaces];
 
                 for (int i = 0; i < numberOfFaces; i++) {
                     faceArray[i] = new FaceDetectionResult();
 
                     final Face face = detectedFaces[i];
@@ skipping 17 matching lines @@
     }
 
     @Override
     public void close() {}
 
     @Override
     public void onConnectionError(MojoException e) {
         close();
     }
 }