Index: base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java |
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java |
index d44c9ddce6dd080d252e30d85864d07db8985afa..a936970a167cdb1aae4bf08ead37e8f95f1299a4 100644 |
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java |
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java |
@@ -4,8 +4,10 @@ |
package org.chromium.base.test; |
-import android.os.Bundle; |
+import android.app.Application; |
+import android.content.Context; |
+import org.chromium.base.annotations.MainDex; |
import org.chromium.base.multidex.ChromiumMultiDexInstaller; |
import org.chromium.base.test.util.CommandLineFlags; |
@@ -14,11 +16,15 @@ import org.chromium.base.test.util.CommandLineFlags; |
* An Instrumentation test runner for applications that are based on |
* {@code org.chromium.base.BaseChromiumApplication} |
*/ |
+@MainDex |
public class BaseChromiumInstrumentationTestRunner extends BaseInstrumentationTestRunner { |
@Override |
- public void onCreate(Bundle arguments) { |
- ChromiumMultiDexInstaller.install(getTargetContext()); |
- super.onCreate(arguments); |
+ public Application newApplication(ClassLoader cl, String className, Context context) |
+ throws ClassNotFoundException, IllegalAccessException, InstantiationException { |
+ ChromiumMultiDexInstaller.install(new BaseChromiumRunnerCommon.MultiDexContextWrapper( |
+ getContext(), getTargetContext())); |
+ BaseChromiumRunnerCommon.reorderDexPathElements(cl, getContext(), getTargetContext()); |
+ return super.newApplication(cl, className, context); |
} |
/** |