Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7538)

Unified Diff: chrome/test/android/javatests/src/org/chromium/chrome/test/TestContentProvider.java

Issue 2949973002: Use multidex capable application for chrome_public_test_apk.
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/android/javatests/src/org/chromium/chrome/test/TestContentProvider.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/TestContentProvider.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/TestContentProvider.java
index b4d5e66224f2061bf163b56f618fafe866c24dbe..ee8dd3bcbb8acaac3b053487c9be9dc1a0337d87 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/TestContentProvider.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/TestContentProvider.java
@@ -17,6 +17,8 @@ import android.net.Uri;
import android.os.ParcelFileDescriptor;
import android.util.Log;
+import org.chromium.base.annotations.MainDex;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -47,6 +49,7 @@ import java.util.Map;
* The second one is moving the TestContentProvider to the ChromeTestSuport apk. This
* seems a lot better path than above.
*/
+@MainDex
public class TestContentProvider extends ContentProvider {
private static final String ANDROID_DATA_FILE_PATH = "android/";
private static final String AUTHORITY = "org.chromium.chrome.test.TestContentProvider";
« no previous file with comments | « no previous file | chrome/test/android/javatests/src/org/chromium/chrome/test/partnercustomizations/TestPartnerBrowserCustomizationsDelayedProvider.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698