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

Unified Diff: chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java

Issue 2239003002: Revert of [Android] Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java
diff --git a/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java b/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java
index ee0912881c515ceb5a284274301bd566389b7bd3..2df3aa6f7d9ee590c9ce52e8bfc5c6c8bc601624 100644
--- a/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java
+++ b/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java
@@ -6,7 +6,6 @@
import android.content.Context;
import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
import android.content.res.AssetManager;
import org.chromium.testing.local.LocalRobolectricTestRunner;
@@ -17,8 +16,9 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
+import org.robolectric.res.builder.RobolectricPackageManager;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -42,7 +42,7 @@
private Context mContext;
private Context mRemoteContext;
private AssetManager mRemoteAssetManager;
- private PackageManager mPackageManager;
+ private RobolectricPackageManager mPackageManager;
/**
* Stub DexLoader. Used to verify the version of the runtime library dex which is used to build
@@ -52,8 +52,8 @@
@Before
public void setUp() {
- mContext = RuntimeEnvironment.application;
- mPackageManager = RuntimeEnvironment.getPackageManager();
+ mContext = Robolectric.application;
+ mPackageManager = (RobolectricPackageManager) mContext.getPackageManager();
setRemoteVersionCode(REMOTE_VERSION_CODE);
mRemoteAssetManager = Mockito.mock(AssetManager.class);
@@ -142,7 +142,7 @@
PackageInfo packageInfo = new PackageInfo();
packageInfo.packageName = REMOTE_PACKAGE_NAME;
packageInfo.versionCode = versionCode;
- RuntimeEnvironment.getRobolectricPackageManager().addPackage(packageInfo);
+ mPackageManager.addPackage(packageInfo);
}
/**

Powered by Google App Engine
This is Rietveld 408576698