Revert of Photo Picker Dialog: Use sandboxed utility process for decoding images.

chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java

Index: chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java
index bd8dba0de3b4683aba1e342f1edd57a12cc7ec72..70d18a837fd8316262c9c3918ccda1a786811a35 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java
@@ -5,6 +5,9 @@
 package org.chromium.chrome.browser.photo_picker;
 
 import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.text.TextUtils;
 
@@ -13,8 +16,7 @@
 /**
  * Holds on to a {@link PickerBitmapView} that displays information about a picker bitmap.
  */
-public class PickerBitmapViewHolder
-        extends ViewHolder implements DecoderServiceHost.ImageDecodedCallback {
+public class PickerBitmapViewHolder extends ViewHolder {
     // Our parent category.
     private PickerCategoryView mCategoryView;
 
@@ -33,9 +35,11 @@
         mItemView = itemView;
     }
 
-    // DecoderServiceHost.ImageDecodedCallback
-
-    @Override
+    /**
+     * The notification handler for when an image has been decoded.
+     * @param filePath The file path for the newly decoded image.
+     * @param bitmap The results of the decoding (or placeholder image, if failed).
+     */
     public void imageDecodedCallback(String filePath, Bitmap bitmap) {
         if (bitmap == null || bitmap.getWidth() == 0 || bitmap.getHeight() == 0) {
             return;
@@ -61,16 +65,31 @@
 
         if (mBitmapDetails.type() == PickerBitmap.CAMERA
                 || mBitmapDetails.type() == PickerBitmap.GALLERY) {
-            mItemView.initialize(mBitmapDetails, null, false);
+            mItemView.initializeSpecialTile(mBitmapDetails);
             return;
         }
 
         // TODO(finnur): Use cached image, if available.
 
-        mItemView.initialize(mBitmapDetails, null, true);
+        // TODO(finnur): Use decoder instead.
+        int size = mCategoryView.getImageSize();
+        imageDecodedCallback(mBitmapDetails.getFilePath(), createPlaceholderBitmap(size, size));
+    }
 
-        int size = mCategoryView.getImageSize();
-        mCategoryView.getDecoderServiceHost().decodeImage(mBitmapDetails.getFilePath(), size, this);
+    /**
+     * Creates a placeholder bitmap.
+     * @param width The requested width of the resulting bitmap.
+     * @param height The requested height of the resulting bitmap.
+     * @return Placeholder bitmap.
+     */
+    // TODO(finnur): Remove once the decoder is in place.
+    private Bitmap createPlaceholderBitmap(int width, int height) {
+        Bitmap placeholder = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(placeholder);
+        Paint paint = new Paint();
+        paint.setColor(Color.GRAY);
+        canvas.drawRect(0, 0, (float) width, (float) height, paint);
+        return placeholder;
     }
 
     /**