chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java - Issue 2760103002: Merge WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME and ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java

Issue 2760103002: Merge WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME and ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME (Closed)

Patch Set: Merge branch 'master' into package_name Created 3 years, 9 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

« chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java

index 14c79254162110ea937ac3a993d73537dffc2a6a..21fadca292b06653c8ea2dda6792afbb7e56d6b4 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java

@@ -15,6 +15,7 @@ import org.chromium.chrome.test.util.ChromeTabUtils;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

import org.chromium.net.test.EmbeddedTestServer;

+import org.chromium.webapk.lib.common.WebApkConstants;

/** Integration tests for WebAPK feature. */

public class WebApkIntegrationTest extends ChromeActivityTestCaseBase<WebApkActivity> {

@@ -29,7 +30,7 @@ public class WebApkIntegrationTest extends ChromeActivityTestCaseBase<WebApkActi

public void startWebApkActivity(String webApkPackageName, final String startUrl)

throws InterruptedException {

Intent intent = new Intent(getInstrumentation().getTargetContext(), WebApkActivity.class);

- intent.putExtra(ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackageName);

+ intent.putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackageName);

intent.putExtra(ShortcutHelper.EXTRA_URL, startUrl);

intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

setActivity(getInstrumentation().startActivitySync(intent));