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

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

Index: chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java
index 268ae51d33a68c584ff748812d9b55822fb3429d..607077913d86af635d7890ef8abb1cd2128ce943 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java
@@ -189,13 +189,8 @@
 
         mBitmapDetails = bitmapDetails;
         setItem(bitmapDetails);
-        if (isCameraTile() || isGalleryTile()) {
-            initializeSpecialTile(mBitmapDetails);
-            mImageLoaded = true;
-        } else {
-            setThumbnailBitmap(thumbnail);
-            mImageLoaded = !placeholder;
-        }
+        setThumbnailBitmap(thumbnail);
+        mImageLoaded = !placeholder;
 
         updateSelectionState();
     }
@@ -222,6 +217,8 @@
                 mSpecialTile, null, image, null, null);
         mSpecialTile.setText(labelStringId);
 
+        initialize(bitmapDetails, null, false);
+
         // Reset visibility, since #initialize() sets mSpecialTile visibility to GONE.
         mSpecialTile.setVisibility(View.VISIBLE);
     }
@@ -269,7 +266,6 @@
      * re-used.
      */
     private void resetTile() {
-        mIconView.setImageBitmap(null);
         mUnselectedView.setVisibility(View.GONE);
         mSelectedView.setVisibility(View.GONE);
         mScrim.setVisibility(View.GONE);
@@ -327,14 +323,15 @@
     }
 
     private boolean isGalleryTile() {
-        return mBitmapDetails.type() == PickerBitmap.GALLERY;
+        // TODO(finnur): Remove the null checks here and below.
+        return mBitmapDetails != null && mBitmapDetails.type() == PickerBitmap.GALLERY;
     }
 
     private boolean isCameraTile() {
-        return mBitmapDetails.type() == PickerBitmap.CAMERA;
+        return mBitmapDetails != null && mBitmapDetails.type() == PickerBitmap.CAMERA;
     }
 
     private boolean isPictureTile() {
-        return mBitmapDetails.type() == PickerBitmap.PICTURE;
+        return mBitmapDetails == null || mBitmapDetails.type() == PickerBitmap.PICTURE;
     }
 }