Use larger vector graphics for special tiles and fix selection ring.

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 607077913d86af635d7890ef8abb1cd2128ce943..9264c2e0354bea13792762293ccf8003a576648e 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
@@ -56,7 +56,7 @@ public class PickerBitmapView extends SelectableItemView<PickerBitmap> {
     private View mScrim;
 
     // The control that signifies the image has been selected.
-    private ImageView mSelectedView;
+    private View mSelectedView;
 
     // The control that signifies the image has not been selected.
     private View mUnselectedView;
@@ -83,7 +83,7 @@ public class PickerBitmapView extends SelectableItemView<PickerBitmap> {
         super.onFinishInflate();
         mIconView = (ImageView) findViewById(R.id.bitmap_view);
         mScrim = findViewById(R.id.scrim);
-        mSelectedView = (ImageView) findViewById(R.id.selected);
+        mSelectedView = findViewById(R.id.selected);
         mUnselectedView = findViewById(R.id.unselected);
         mSpecialTile = (TextView) findViewById(R.id.special_tile);
     }
@@ -205,11 +205,12 @@ public class PickerBitmapView extends SelectableItemView<PickerBitmap> {
         Resources resources = mContext.getResources();
 
         if (isCameraTile()) {
-            image = ApiCompatibilityUtils.getDrawable(resources, R.drawable.ic_photo_camera);
+            image = VectorDrawableCompat.create(
+                    resources, R.drawable.ic_photo_camera600_48dp, mContext.getTheme());
             labelStringId = R.string.photo_picker_camera;
         } else {
             image = VectorDrawableCompat.create(
-                    resources, R.drawable.ic_collections_grey, mContext.getTheme());
+                    resources, R.drawable.ic_collections_grey600_48dp, mContext.getTheme());
             labelStringId = R.string.photo_picker_browse;
         }