| Index: chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheLauncherTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheLauncherTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheLauncherTest.java
|
| index abac4e488528b88bdc1ef342f07d1a07758cc972..4ff10a7824e5e2ca8cd7feeb6235b183439a0afb 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheLauncherTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheLauncherTest.java
|
| @@ -26,7 +26,7 @@ import org.chromium.base.test.util.Feature;
|
| import org.chromium.base.test.util.Restriction;
|
| import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
|
| import org.chromium.chrome.browser.sync.ProfileSyncService;
|
| -import org.chromium.content.browser.test.NativeLibraryTestRule;
|
| +import org.chromium.chrome.browser.test.ChromeBrowserTestRule;
|
|
|
| import java.util.EnumSet;
|
| import java.util.concurrent.Callable;
|
| @@ -39,7 +39,7 @@ import java.util.concurrent.Callable;
|
| @RunWith(BaseJUnit4ClassRunner.class)
|
| public class PrecacheLauncherTest {
|
| @Rule
|
| - public NativeLibraryTestRule mActivityTestRule = new NativeLibraryTestRule();
|
| + public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
|
|
|
| private StubProfileSyncService mSync;
|
| private PrecacheLauncherUnderTest mLauncher;
|
| @@ -112,9 +112,6 @@ public class PrecacheLauncherTest {
|
| // in case another test class has modified this pref.
|
| PrecacheController.setIsPrecachingEnabled(getTargetContext(), false);
|
|
|
| - // ProfileSyncService needs the browser process to be running.
|
| - mActivityTestRule.loadNativeLibraryAndInitBrowserProcess();
|
| -
|
| // ProfileSyncService must be initialized on the UI thread. Oddly, even though
|
| // ThreadUtils.runningOnUiThread() is true here, it's, no, not really, no.
|
| ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
|
|