chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java - Issue 2351113005: [Reland] Refactor WebappRegistry into a singleton instance.

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

Issue 2351113005: [Reland] Refactor WebappRegistry into a singleton instance. (Closed)

Patch Set: Fix WebappModeTest Created 4 years, 3 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/WebappActivity.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/webapps/TestFetchStorageCallback.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.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/WebappActivityTestBase.java

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

index ec1f26a1bd1fb623e199c01278aef335753d9c5c..374353b1a613cde8d558ac28b42e753ca5fb9c7f 100644

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

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

@@ -92,10 +92,12 @@ public abstract class WebappActivityTestBase extends ChromeActivityTestCaseBase<

protected void setUp() throws Exception {

super.setUp();

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

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

// thread.

- WebappRegistry.registerWebapp(

+ WebappRegistry.warmUpSharedPrefs("");

+ WebappRegistry.getInstance().register(

WEBAPP_ID, new WebappRegistry.FetchWebappDataStorageCallback() {

@Override

public void onWebappDataStorageRetrieved(WebappDataStorage storage) {