| Index: base/android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java
|
| diff --git a/base/android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java b/base/android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java
|
| index d3441f7895fed53357bb427c05a25cb8cd42eac5..239de67a6b626528a59674b5677820a5e48856ae 100644
|
| --- a/base/android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java
|
| +++ b/base/android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java
|
| @@ -13,6 +13,7 @@ import android.view.KeyEvent;
|
| import junit.framework.Assert;
|
|
|
| import org.chromium.base.BaseChromiumApplication.WindowFocusChangedListener;
|
| +import org.chromium.base.test.shadows.ShadowMultiDex;
|
| import org.chromium.testing.local.LocalRobolectricTestRunner;
|
| import org.junit.Test;
|
| import org.junit.runner.RunWith;
|
| @@ -25,10 +26,12 @@ import org.robolectric.util.ActivityController;
|
|
|
| /** Unit tests for {@link BaseChromiumApplication}. */
|
| @RunWith(LocalRobolectricTestRunner.class)
|
| -@Config(manifest = Config.NONE, application = BaseChromiumApplication.class,
|
| - shadows = {BaseChromiumApplicationTest.TrackingShadowActivity.class})
|
| +@Config(manifest = Config.NONE,
|
| + application = BaseChromiumApplication.class,
|
| + shadows = {BaseChromiumApplicationTest.TrackingShadowActivity.class, ShadowMultiDex.class})
|
| public class BaseChromiumApplicationTest {
|
|
|
| + /** Shadow that tracks calls to onWindowFocusChanged and dispatchKeyEvent. */
|
| @Implements(Activity.class)
|
| public static class TrackingShadowActivity extends ShadowActivity {
|
| private int mWindowFocusCalls;
|
|
|