Index: base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java |
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java |
index 35fe9b9bd1b4a541772ba5588a2426ef7dbc3b22..0eab2314b40b7abec9e44e6ef52c18e60e952365 100644 |
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java |
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java |
@@ -8,6 +8,7 @@ import android.content.Context; |
import android.net.ConnectivityManager; |
import android.net.NetworkInfo; |
import android.os.Build; |
+import android.os.Bundle; |
import android.test.AndroidTestRunner; |
import android.test.InstrumentationTestRunner; |
import android.text.TextUtils; |
@@ -17,6 +18,7 @@ import junit.framework.TestResult; |
import org.chromium.base.Log; |
import org.chromium.base.SysUtils; |
+import org.chromium.base.multidex.ChromiumMultiDex; |
import org.chromium.base.test.BaseTestResult.SkipCheck; |
import org.chromium.base.test.util.MinAndroidSdkLevel; |
import org.chromium.base.test.util.Restriction; |
@@ -32,6 +34,12 @@ public class BaseInstrumentationTestRunner extends InstrumentationTestRunner { |
private static final String TAG = "cr.base.test"; |
@Override |
+ public void onCreate(Bundle arguments) { |
+ ChromiumMultiDex.install(getTargetContext()); |
+ super.onCreate(arguments); |
+ } |
+ |
+ @Override |
protected AndroidTestRunner getAndroidTestRunner() { |
AndroidTestRunner runner = new AndroidTestRunner() { |
@Override |