content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java - Issue 335293002: Dismiss WebsiteSettings when a new page is committed.

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: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java

Issue 335293002: Dismiss WebsiteSettings when a new page is committed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: also fix chrome-layer tests Created 6 years, 6 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

« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java ('k') | content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java

diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java

index f02ba5119a781ffdc469058cbd65a9d0fc492649..1fb05e7a14fafb05a5bd7434b46409e3e2f3d86f 100644

--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java

+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java

@@ -5,6 +5,7 @@

package org.chromium.content.browser.test.util;

+import org.chromium.base.ThreadUtils;

import org.chromium.content.browser.ContentViewCore;

import java.util.concurrent.TimeUnit;

@@ -15,12 +16,20 @@ import java.util.concurrent.TimeoutException;

public class TestCallbackHelperContainer {

private final TestContentViewClient mTestContentViewClient;

- private final TestWebContentsObserver mTestWebContentsObserver;

+ private TestWebContentsObserver mTestWebContentsObserver;

- public TestCallbackHelperContainer(ContentViewCore contentViewCore) {

+ public TestCallbackHelperContainer(final ContentViewCore contentViewCore) {

mTestContentViewClient = new TestContentViewClient();

contentViewCore.setContentViewClient(mTestContentViewClient);

- mTestWebContentsObserver = new TestWebContentsObserver(contentViewCore);

+ // TODO(yfriedman): Change callers to be executed on the UI thread. Unfortunately this is

+ // super convenient as the caller is nearly always on the test thread which is fine to block

+ // and it's cumbersome to keep bouncing to the UI thread.

+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {

+ @Override

+ public void run() {

+ mTestWebContentsObserver = new TestWebContentsObserver(contentViewCore);

+ }

+ });

}

protected TestCallbackHelperContainer(