| Index: chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
|
| index edace7e9cd703a7e27c48b8e263695c600bc3ba0..e1d423e48a4e2cdf7f6ad0db2206ca448ce3dd01 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
|
| @@ -26,8 +26,8 @@ import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.Overrid
|
| import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.chrome.browser.tab.TabRedirectHandler;
|
| import org.chromium.chrome.browser.util.FeatureUtilities;
|
| -import org.chromium.minting.lib.client.MintingStateParams;
|
| -import org.chromium.minting.lib.client.WebAPKValidator;
|
| +import org.chromium.minting.lib.client.WebApkStateParams;
|
| +import org.chromium.minting.lib.client.WebApkValidator;
|
| import org.chromium.ui.base.PageTransition;
|
|
|
| import java.net.URISyntaxException;
|
| @@ -819,9 +819,9 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
|
| */
|
| @SmallTest
|
| public void testWebAPK_InMintedRuntimeNavigationRemainsInWebAPK() {
|
| - MintingStateParams params = new MintingStateParams(true, WEB_APK_PACKAGE_NAME,
|
| + WebApkStateParams params = new WebApkStateParams(true, WEB_APK_PACKAGE_NAME,
|
| WEB_APK_SCOPE);
|
| - ChromeApplication.setMintingStateParams(params);
|
| + ChromeApplication.setWebApkStateParams(params);
|
| checkUrl(WEB_APK_SCOPE)
|
| .expecting(OverrideUrlLoadingResult.NO_OVERRIDE, IGNORE);
|
| }
|
| @@ -832,9 +832,9 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
|
| */
|
| @SmallTest
|
| public void testWebAPK_InMintedRuntimeNavigationBounceToChrome() {
|
| - MintingStateParams params = new MintingStateParams(true, WEB_APK_PACKAGE_NAME,
|
| + WebApkStateParams params = new WebApkStateParams(true, WEB_APK_PACKAGE_NAME,
|
| WEB_APK_SCOPE);
|
| - ChromeApplication.setMintingStateParams(params);
|
| + ChromeApplication.setWebApkStateParams(params);
|
| checkUrl(NON_WEB_APK_SCOPE)
|
| .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_INTENT_BACKTO_HOST_BROWSER,
|
| IGNORE);
|
| @@ -848,18 +848,18 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
|
| */
|
| @SmallTest
|
| public void testWebAPK_InMintedRuntimeNavigationBounceToAnotherWebAPK() {
|
| - MintingStateParams params = new MintingStateParams(
|
| + WebApkStateParams params = new WebApkStateParams(
|
| true, WEB_APK_WITH_NATIVE_APP_PACKAGE_NAME, WEB_APK_WITH_NATIVE_APP_SCOPE);
|
| - ChromeApplication.setMintingStateParams(params);
|
| + ChromeApplication.setWebApkStateParams(params);
|
| checkUrl(WEB_APK_SCOPE)
|
| .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_INTENT_TO_MINTED_APK, IGNORE);
|
| }
|
|
|
| @SmallTest
|
| public void testWebAPK_InMintedRuntimeNavigationBounceToAnotherWebAPK_ExceptIfInvalid() {
|
| - MintingStateParams params = new MintingStateParams(
|
| + WebApkStateParams params = new WebApkStateParams(
|
| true, WEB_APK_WITH_NATIVE_APP_PACKAGE_NAME, WEB_APK_WITH_NATIVE_APP_SCOPE);
|
| - ChromeApplication.setMintingStateParams(params);
|
| + ChromeApplication.setWebApkStateParams(params);
|
| checkUrl(WEB_APK_SCOPE)
|
| .withInvalidWebApk()
|
| .expecting(OverrideUrlLoadingResult.NO_OVERRIDE, IGNORE);
|
| @@ -873,9 +873,9 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
|
| */
|
| @SmallTest
|
| public void testWebAPK_InMintedRuntimeNavigationBounceToAnotherWebAPKWithIntentPicker() {
|
| - MintingStateParams params = new MintingStateParams(true, WEB_APK_PACKAGE_NAME,
|
| + WebApkStateParams params = new WebApkStateParams(true, WEB_APK_PACKAGE_NAME,
|
| WEB_APK_SCOPE);
|
| - ChromeApplication.setMintingStateParams(params);
|
| + ChromeApplication.setWebApkStateParams(params);
|
| checkUrl(WEB_APK_WITH_NATIVE_APP_SCOPE)
|
| .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT, START_ACTIVITY);
|
| }
|
| @@ -1020,7 +1020,7 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
|
|
|
| @Override
|
| public String findWebAPKPackage(List<ResolveInfo> resolveInfos) {
|
| - return WebAPKValidator.findWebAPKPackage(resolveInfos);
|
| + return WebApkValidator.findWebAPKPackage(resolveInfos);
|
| }
|
|
|
| @Override
|
|
|