RELAND: ShapeDetection: use mojom::Bitmap for mojo interface.

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

Index: services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java
diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java
index 343502de865a8f22ee8937e1f7e8435af3b6ab0c..db3fc7f9318606dcc0287fd4741414875faef495 100644
--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java
+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java
@@ -19,7 +19,6 @@ import org.chromium.base.Log;
 import org.chromium.gfx.mojom.PointF;
 import org.chromium.gfx.mojom.RectF;
 import org.chromium.mojo.system.MojoException;
-import org.chromium.mojo.system.SharedBufferHandle;
 import org.chromium.services.service_manager.InterfaceFactory;
 import org.chromium.shape_detection.mojom.BarcodeDetection;
 import org.chromium.shape_detection.mojom.BarcodeDetectionResult;
@@ -39,8 +38,7 @@ public class BarcodeDetectionImpl implements BarcodeDetection {
     }
 
     @Override
-    public void detect(
-            SharedBufferHandle frameData, int width, int height, DetectResponse callback) {
+    public void detect(org.chromium.skia.mojom.Bitmap bitmapData, DetectResponse callback) {
         if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mContext)
                 != ConnectionResult.SUCCESS) {
             Log.e(TAG, "Google Play Services not available");
@@ -57,7 +55,7 @@ public class BarcodeDetectionImpl implements BarcodeDetection {
             return;
         }
 
-        Frame frame = SharedBufferUtils.convertToFrame(frameData, width, height);
+        Frame frame = BitmapUtils.convertToFrame(bitmapData);
         if (frame == null) {
             Log.e(TAG, "Error converting SharedMemory to Frame");
             callback.call(new BarcodeDetectionResult[0]);