Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java

Issue 2954393003: Fix test crashes related to AccountManagerHelper. (Closed)
Patch Set: . Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java
index dcfdab2d6a3d7622ab920165f48fd8c8846b776d..b4916d5890416eb2501bef5fa4512424a1312cca 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java
@@ -9,7 +9,6 @@ import android.content.SharedPreferences;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
-import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
@@ -21,7 +20,7 @@ import org.chromium.base.ThreadUtils;
import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.accessibility.FontSizePrefs.FontSizePrefsObserver;
-import org.chromium.content.browser.test.NativeLibraryTestRule;
+import org.chromium.chrome.browser.test.ChromeBrowserTestRule;
import java.util.concurrent.Callable;
@@ -31,25 +30,19 @@ import java.util.concurrent.Callable;
@RunWith(BaseJUnit4ClassRunner.class)
public class FontSizePrefsTest {
@Rule
- public NativeLibraryTestRule mActivityTestRule = new NativeLibraryTestRule();
+ public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
private static final float EPSILON = 0.001f;
private FontSizePrefs mFontSizePrefs;
@Before
public void setUp() throws Exception {
- mActivityTestRule.loadNativeLibraryAndInitBrowserProcess();
resetSharedPrefs();
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
mFontSizePrefs = getFontSizePrefs(context);
setSystemFontScaleForTest(1.0f);
}
- @After
- public void tearDown() throws Exception {
- resetSharedPrefs();
- }
-
private void resetSharedPrefs() {
SharedPreferences.Editor editor = ContextUtils.getAppSharedPreferences().edit();
editor.remove(FontSizePrefs.PREF_USER_SET_FORCE_ENABLE_ZOOM);

Powered by Google App Engine
This is Rietveld 408576698