| Index: test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
|
| diff --git a/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java b/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
|
| index de2498bc6030abadb19cc8821f21ddbe4fea91cd..03b7c8d83fb7eb2149bb35bcf030b94dafa837e0 100644
|
| --- a/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
|
| +++ b/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
|
|
|