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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.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/share/ShareUrlTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.java
index 50c3a6fa8ef043cc2c8c9d87d00893a692d70788..d749e16f0f45fee94f9486f3ceed1c1fc91fb894 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.java
@@ -7,17 +7,16 @@ package org.chromium.chrome.browser.share;
import android.app.Activity;
import android.content.Intent;
import android.support.test.filters.SmallTest;
-import android.support.test.rule.UiThreadTestRule;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.chromium.base.ThreadUtils;
import org.chromium.base.test.BaseJUnit4ClassRunner;
+import org.chromium.chrome.browser.test.ChromeBrowserTestRule;
import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
-import org.chromium.content.browser.test.NativeLibraryTestRule;
/**
* Tests sharing URLs in reader mode (DOM distiller)
@@ -25,22 +24,14 @@ import org.chromium.content.browser.test.NativeLibraryTestRule;
@RunWith(BaseJUnit4ClassRunner.class)
public class ShareUrlTest {
@Rule
- public NativeLibraryTestRule mActivityTestRule = new NativeLibraryTestRule();
-
- @Rule
- public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule();
+ public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
private static final String HTTP_URL = "http://www.google.com/";
private static final String HTTPS_URL = "https://www.google.com/";
- @Before
- public void setUp() throws Exception {
- mActivityTestRule.loadNativeLibraryAndInitBrowserProcess();
- }
-
private void assertCorrectUrl(final String originalUrl, final String sharedUrl)
throws Throwable {
- mUiThreadTestRule.runOnUiThread(new Runnable() {
+ ThreadUtils.runOnUiThread(new Runnable() {
@Override
public void run() {
ShareParams params =

Powered by Google App Engine
This is Rietveld 408576698