| Index: chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
|
| diff --git a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
|
| index 4bd55826f29af2c025c213e193623972e3c552e6..b6e5245dc114d48238124d605dfe3ec557e84df7 100644
|
| --- a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
|
| +++ b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
|
| @@ -19,7 +19,7 @@ import org.junit.Assert;
|
| import org.junit.Before;
|
| import org.junit.Test;
|
| import org.junit.runner.RunWith;
|
| -import org.robolectric.Robolectric;
|
| +import org.robolectric.RuntimeEnvironment;
|
| import org.robolectric.annotation.Config;
|
| import org.robolectric.res.builder.RobolectricPackageManager;
|
|
|
| @@ -57,7 +57,8 @@ public class WebApkValidatorTest {
|
|
|
| @Before
|
| public void setUp() {
|
| - mPackageManager = (RobolectricPackageManager) Robolectric.application.getPackageManager();
|
| + mPackageManager = (RobolectricPackageManager) RuntimeEnvironment
|
| + .application.getPackageManager();
|
| WebApkValidator.initWithBrowserHostSignature(EXPECTED_SIGNATURE);
|
| }
|
|
|
| @@ -75,8 +76,8 @@ public class WebApkValidatorTest {
|
| mPackageManager.addPackage(newPackageInfoWithOneSignature(
|
| WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
|
|
|
| - assertEquals(WEBAPK_PACKAGE_NAME,
|
| - WebApkValidator.queryWebApkPackage(Robolectric.application, URL_OF_WEBAPK));
|
| + assertEquals(WEBAPK_PACKAGE_NAME, WebApkValidator.queryWebApkPackage(
|
| + RuntimeEnvironment.application, URL_OF_WEBAPK));
|
| } catch (URISyntaxException e) {
|
| Assert.fail("URI is invalid.");
|
| }
|
| @@ -95,7 +96,7 @@ public class WebApkValidatorTest {
|
| WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
|
|
|
| assertNull(WebApkValidator.queryWebApkPackage(
|
| - Robolectric.application, URL_OF_WEBAPK));
|
| + RuntimeEnvironment.application, URL_OF_WEBAPK));
|
| } catch (URISyntaxException e) {
|
| Assert.fail("URI is invalid.");
|
| }
|
| @@ -116,7 +117,7 @@ public class WebApkValidatorTest {
|
| WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
|
|
|
| assertNull(WebApkValidator.queryWebApkPackage(
|
| - Robolectric.application, URL_WITHOUT_WEBAPK));
|
| + RuntimeEnvironment.application, URL_WITHOUT_WEBAPK));
|
| } catch (URISyntaxException e) {
|
| Assert.fail("URI is invalid.");
|
| }
|
| @@ -134,7 +135,7 @@ public class WebApkValidatorTest {
|
| WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
|
|
|
| assertEquals(WEBAPK_PACKAGE_NAME,
|
| - WebApkValidator.findWebApkPackage(Robolectric.application, infos));
|
| + WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
|
| }
|
|
|
| /**
|
| @@ -148,7 +149,7 @@ public class WebApkValidatorTest {
|
| mPackageManager.addPackage(newPackageInfoWithOneSignature(
|
| INVALID_WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
|
|
|
| - assertNull(WebApkValidator.findWebApkPackage(Robolectric.application, infos));
|
| + assertNull(WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
|
| }
|
|
|
| /**
|
| @@ -165,7 +166,7 @@ public class WebApkValidatorTest {
|
| mPackageManager.addPackage(newPackageInfo(WEBAPK_PACKAGE_NAME, signatures));
|
|
|
| assertEquals(WEBAPK_PACKAGE_NAME,
|
| - WebApkValidator.findWebApkPackage(Robolectric.application, infos));
|
| + WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
|
| }
|
|
|
| /**
|
| @@ -181,7 +182,7 @@ public class WebApkValidatorTest {
|
| new Signature[] {new Signature(SIGNATURE_1), new Signature(SIGNATURE_2)};
|
| mPackageManager.addPackage(newPackageInfo(WEBAPK_PACKAGE_NAME, signatures));
|
|
|
| - assertNull(WebApkValidator.findWebApkPackage(Robolectric.application, infos));
|
| + assertNull(WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
|
| }
|
|
|
| private static ResolveInfo newResolveInfo(String packageName) {
|
|
|