| Index: chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/WebApkUtilsTest.java
|
| diff --git a/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/WebApkUtilsTest.java b/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/WebApkUtilsTest.java
|
| index f33a9c83235b54cce9764ae49440f6d20f6734d4..548f7cbc4e85a329618e8251e60e3fe6f5356c26 100644
|
| --- a/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/WebApkUtilsTest.java
|
| +++ b/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/WebApkUtilsTest.java
|
| @@ -53,8 +53,9 @@ public class WebApkUtilsTest {
|
| @Before
|
| public void setUp() {
|
| mContext = RuntimeEnvironment.application;
|
| - mPackageManager =
|
| - Mockito.spy((RobolectricPackageManager) RuntimeEnvironment.getPackageManager());
|
| + WebApkTestHelper.setUpPackageManager();
|
| +
|
| + mPackageManager = Mockito.spy(RuntimeEnvironment.getRobolectricPackageManager());
|
| RuntimeEnvironment.setRobolectricPackageManager(mPackageManager);
|
|
|
| WebApkUtils.resetCachedHostPackageForTesting();
|
| @@ -81,7 +82,7 @@ public class WebApkUtilsTest {
|
| setHostBrowserInSharedPreferences(expectedHostBrowser);
|
|
|
| String hostBrowser = WebApkUtils.getHostBrowserPackageName(mContext);
|
| - Assert.assertEquals(hostBrowser, expectedHostBrowser);
|
| + Assert.assertEquals(expectedHostBrowser, hostBrowser);
|
| }
|
|
|
| /**
|
| @@ -108,7 +109,7 @@ public class WebApkUtilsTest {
|
| // Simulates there is a host browser stored in the SharedPreference but uninstalled.
|
| setHostBrowserInSharedPreferences(BROWSER_UNINSTALLED_SUPPORTING_WEBAPKS);
|
| hostBrowser = WebApkUtils.getHostBrowserPackageName(mContext);
|
| - Assert.assertEquals(hostBrowser, expectedHostBrowser);
|
| + Assert.assertEquals(expectedHostBrowser, hostBrowser);
|
| }
|
|
|
| /**
|
| @@ -148,7 +149,7 @@ public class WebApkUtilsTest {
|
| setHostBrowserInSharedPreferences(null);
|
|
|
| String hostBrowser = WebApkUtils.getHostBrowserPackageName(mContext);
|
| - Assert.assertEquals(hostBrowser, defaultBrowser);
|
| + Assert.assertEquals(defaultBrowser, hostBrowser);
|
| }
|
|
|
| /**
|
|
|