| 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 2df3aa6f7d9ee590c9ce52e8bfc5c6c8bc601624..ee0912881c515ceb5a284274301bd566389b7bd3 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,6 +6,7 @@ package org.chromium.webapk.shell_apk;
|
|
|
| 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;
|
| @@ -16,9 +17,8 @@ import org.junit.Before;
|
| import org.junit.Test;
|
| import org.junit.runner.RunWith;
|
| import org.mockito.Mockito;
|
| -import org.robolectric.Robolectric;
|
| +import org.robolectric.RuntimeEnvironment;
|
| import org.robolectric.annotation.Config;
|
| -import org.robolectric.res.builder.RobolectricPackageManager;
|
|
|
| import java.io.ByteArrayInputStream;
|
| import java.io.File;
|
| @@ -42,7 +42,7 @@ public class HostBrowserClassLoaderTest {
|
| private Context mContext;
|
| private Context mRemoteContext;
|
| private AssetManager mRemoteAssetManager;
|
| - private RobolectricPackageManager mPackageManager;
|
| + private PackageManager mPackageManager;
|
|
|
| /**
|
| * Stub DexLoader. Used to verify the version of the runtime library dex which is used to build
|
| @@ -52,8 +52,8 @@ public class HostBrowserClassLoaderTest {
|
|
|
| @Before
|
| public void setUp() {
|
| - mContext = Robolectric.application;
|
| - mPackageManager = (RobolectricPackageManager) mContext.getPackageManager();
|
| + mContext = RuntimeEnvironment.application;
|
| + mPackageManager = RuntimeEnvironment.getPackageManager();
|
| setRemoteVersionCode(REMOTE_VERSION_CODE);
|
|
|
| mRemoteAssetManager = Mockito.mock(AssetManager.class);
|
| @@ -142,7 +142,7 @@ public class HostBrowserClassLoaderTest {
|
| PackageInfo packageInfo = new PackageInfo();
|
| packageInfo.packageName = REMOTE_PACKAGE_NAME;
|
| packageInfo.versionCode = versionCode;
|
| - mPackageManager.addPackage(packageInfo);
|
| + RuntimeEnvironment.getRobolectricPackageManager().addPackage(packageInfo);
|
| }
|
|
|
| /**
|
|
|