| Index: chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialog.java
 | 
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialog.java
 | 
| index d42df1f38b2f9a6cb4ed8424f75521186fd071b4..260f34721a8bddac4221fe1c86ae286517309aeb 100644
 | 
| --- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialog.java
 | 
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialog.java
 | 
| @@ -6,13 +6,17 @@ package org.chromium.chrome.browser.photo_picker;
 | 
|  
 | 
|  import android.content.Context;
 | 
|  import android.os.Bundle;
 | 
| +import android.support.annotation.Nullable;
 | 
|  import android.support.v7.app.AlertDialog;
 | 
|  import android.view.ViewGroup.LayoutParams;
 | 
|  import android.view.WindowManager;
 | 
|  
 | 
| +import org.chromium.base.VisibleForTesting;
 | 
|  import org.chromium.chrome.R;
 | 
|  import org.chromium.ui.PhotoPickerListener;
 | 
|  
 | 
| +import java.util.List;
 | 
| +
 | 
|  /**
 | 
|   * UI for the photo chooser that shows on the Android platform as a result of
 | 
|   * <input type=file accept=image > form element.
 | 
| @@ -27,13 +31,14 @@ public class PhotoPickerDialog extends AlertDialog {
 | 
|       * @param listener The listener object that gets notified when an action is taken.
 | 
|       * @param multiSelectionAllowed Whether the photo picker should allow multiple items to be
 | 
|       *                              selected.
 | 
| +     * @param testFiles A list of photos to show (testing use only).
 | 
|       */
 | 
| -    public PhotoPickerDialog(
 | 
| -            Context context, PhotoPickerListener listener, boolean multiSelectionAllowed) {
 | 
| +    public PhotoPickerDialog(Context context, PhotoPickerListener listener,
 | 
| +            boolean multiSelectionAllowed, @Nullable List<PickerBitmap> testFiles) {
 | 
|          super(context, R.style.FullscreenWhite);
 | 
|  
 | 
|          // Initialize the main content view.
 | 
| -        mCategoryView = new PickerCategoryView(context);
 | 
| +        mCategoryView = new PickerCategoryView(context, testFiles);
 | 
|          mCategoryView.initialize(this, listener, multiSelectionAllowed);
 | 
|          setView(mCategoryView);
 | 
|      }
 | 
| @@ -52,4 +57,9 @@ public class PhotoPickerDialog extends AlertDialog {
 | 
|          super.dismiss();
 | 
|          mCategoryView.onDialogDismissed();
 | 
|      }
 | 
| +
 | 
| +    @VisibleForTesting
 | 
| +    public PickerCategoryView getCategoryViewForTesting() {
 | 
| +        return mCategoryView;
 | 
| +    }
 | 
|  }
 | 
| 
 |