| Index: chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java
|
| diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java
|
| index b0ac68b1fef5ef5d8e4202a6925e48100bc62210..1f5b49ce9d8cf063ba12bccc5ee24f66a9444d76 100644
|
| --- a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java
|
| +++ b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java
|
| @@ -21,6 +21,15 @@ import android.text.TextUtils;
|
| import android.util.AttributeSet;
|
| import android.util.DisplayMetrics;
|
|
|
| +import org.junit.Before;
|
| +import org.junit.Test;
|
| +import org.junit.runner.RunWith;
|
| +import org.mockito.Mock;
|
| +import org.mockito.MockitoAnnotations;
|
| +import org.robolectric.RuntimeEnvironment;
|
| +import org.robolectric.annotation.Config;
|
| +
|
| +import org.chromium.base.ContextUtils;
|
| import org.chromium.base.test.util.Feature;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.compositor.layouts.LayoutRenderHost;
|
| @@ -30,19 +39,13 @@ import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.chrome.browser.tabmodel.EmptyTabModel;
|
| import org.chromium.testing.local.LocalRobolectricTestRunner;
|
| import org.chromium.ui.base.LocalizationUtils;
|
| -import org.junit.Before;
|
| -import org.junit.Test;
|
| -import org.junit.runner.RunWith;
|
| -import org.mockito.Mock;
|
| -import org.mockito.MockitoAnnotations;
|
| -import org.robolectric.annotation.Config;
|
|
|
| import java.util.ArrayList;
|
| import java.util.List;
|
|
|
| /** Tests for {@link StripLayoutHelper}. */
|
| @RunWith(LocalRobolectricTestRunner.class)
|
| -@Config(manifest = Config.NONE)
|
| +@Config(manifest = Config.NONE, sdk = 21)
|
| public class StripLayoutHelperTest {
|
| @Mock private Context mContext;
|
| @Mock private Resources mResources;
|
| @@ -63,6 +66,8 @@ public class StripLayoutHelperTest {
|
| /** Reset the environment before each test. */
|
| @Before
|
| public void beforeTest() {
|
| + ContextUtils.initApplicationContextForTests(RuntimeEnvironment.application);
|
| +
|
| MockitoAnnotations.initMocks(this);
|
| when(mContext.getResources()).thenReturn(mResources);
|
| when(mResources.getString(R.string.accessibility_tabstrip_btn_close_tab)).thenReturn(
|
|
|