chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java - Issue 1749603002: Store URLs in WebappDataStorage, and purge them when history is cleared.

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/WebappModeTest.java

Issue 1749603002: Store URLs in WebappDataStorage, and purge them when history is cleared. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing reviewer comments Created 4 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/WebappDataStorage.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java » ('j') | chrome/browser/android/shortcut_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ba6e409ad3994ea015a283050a10b7cb89e8aeb7..4013c2e2113d8187666ffbf3b0b270e3e85bfb23 100644

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

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

@@ -51,11 +51,13 @@ public class WebappModeTest extends MultiActivityTestBase {

+ "content='width=device-width initial-scale=0.5, maximum-scale=0.5'></head>"

+ "<body bgcolor='#011684'>Webapp 1</body></html>");

private static final String WEBAPP_1_TITLE = "Web app #1";

+ private static final String WEBAPP_1_ORIGIN = "https://www.google.com";

private static final String WEBAPP_2_ID = "webapp_id_2";

private static final String WEBAPP_2_URL =

UrlUtils.encodeHtmlDataUri("<html><body bgcolor='#840116'>Webapp 2</body></html>");

private static final String WEBAPP_2_TITLE = "Web app #2";

+ private static final String WEBAPP_2_ORIGIN = "http://google.com";

private static final String WEBAPP_ICON = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAACXB"

+ "IWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wQIFB4cxOfiSQAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdG"

@@ -92,8 +94,10 @@ public class WebappModeTest extends MultiActivityTestBase {

// Register the webapps so when the data storage is opened, the test doesn't crash. There is

// no race condition with the retrival as AsyncTasks are run sequentially on the background

// thread.

- WebappRegistry.registerWebapp(getInstrumentation().getTargetContext(), WEBAPP_1_ID);

- WebappRegistry.registerWebapp(getInstrumentation().getTargetContext(), WEBAPP_2_ID);

+ WebappRegistry.registerWebapp(getInstrumentation().getTargetContext(), WEBAPP_1_ID,

+ WEBAPP_1_ORIGIN);

+ WebappRegistry.registerWebapp(getInstrumentation().getTargetContext(), WEBAPP_2_ID,

+ WEBAPP_2_ORIGIN);

}

/**