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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestRule.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/tabmodel/TabModelSelectorObserverTestRule.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestRule.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestRule.java
index 320e74ad144afbea53b24551513b642dfbb14248..bc3657a257bc925199e5e1909fcc0f5f80e511c5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestRule.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestRule.java
@@ -15,7 +15,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
-import org.chromium.content.browser.test.NativeLibraryTestRule;
+import org.chromium.chrome.browser.test.ChromeBrowserTestRule;
import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.ui.base.WindowAndroid;
@@ -25,7 +25,7 @@ import java.util.Set;
/**
* Basis for testing tab model selector observers.
*/
-public class TabModelSelectorObserverTestRule extends NativeLibraryTestRule {
+public class TabModelSelectorObserverTestRule extends ChromeBrowserTestRule {
private TabModelSelectorBase mSelector;
private TabModelSelectorTestTabModel mNormalTabModel;
private TabModelSelectorTestTabModel mIncognitoTabModel;
@@ -50,6 +50,7 @@ public class TabModelSelectorObserverTestRule extends NativeLibraryTestRule {
@Override
public Statement apply(final Statement base, Description description) {
+ CommandLine.init(null);
return super.apply(new Statement() {
@Override
public void evaluate() throws Throwable {
@@ -60,9 +61,6 @@ public class TabModelSelectorObserverTestRule extends NativeLibraryTestRule {
}
private void setUp() throws Exception {
- CommandLine.init(null);
- loadNativeLibraryAndInitBrowserProcess();
-
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {

Powered by Google App Engine
This is Rietveld 408576698