| Index: base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java
|
| diff --git a/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java b/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java
|
| index fe9d5403de7d93823d3a0da3ca1bb427d8deecc6..f6d5f60a729cd79c0d4a3407a0ea394534463035 100644
|
| --- a/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java
|
| +++ b/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java
|
| @@ -5,6 +5,7 @@
|
| package org.chromium.base;
|
|
|
| import android.content.ContentValues;
|
| +import android.content.Context;
|
| import android.database.Cursor;
|
| import android.net.Uri;
|
| import android.provider.MediaStore;
|
| @@ -19,16 +20,19 @@
|
| * Insert an image into the MediaStore, and return the content URI. If the
|
| * image already exists in the MediaStore, just retrieve the URI.
|
| *
|
| + * @param context Application context.
|
| * @param path Path to the image file.
|
| * @return Content URI of the image.
|
| */
|
| @CalledByNative
|
| - private static String insertImageIntoMediaStore(String path) {
|
| + private static String insertImageIntoMediaStore(Context context, String path) {
|
| // Check whether the content URI exists.
|
| - Cursor c = ContextUtils.getApplicationContext().getContentResolver().query(
|
| + Cursor c = context.getContentResolver().query(
|
| MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
|
| - new String[] {MediaStore.Video.VideoColumns._ID},
|
| - MediaStore.Images.Media.DATA + " LIKE ?", new String[] {path}, null);
|
| + new String[] { MediaStore.Video.VideoColumns._ID },
|
| + MediaStore.Images.Media.DATA + " LIKE ?",
|
| + new String[] { path },
|
| + null);
|
| if (c != null && c.getCount() > 0) {
|
| c.moveToFirst();
|
| int id = c.getInt(0);
|
| @@ -39,7 +43,7 @@
|
| // Insert the content URI into MediaStore.
|
| ContentValues values = new ContentValues();
|
| values.put(MediaStore.MediaColumns.DATA, path);
|
| - Uri uri = ContextUtils.getApplicationContext().getContentResolver().insert(
|
| + Uri uri = context.getContentResolver().insert(
|
| MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
|
| return uri.toString();
|
| }
|
|
|