content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java - Issue 551913002: Fix revert conflict from last commit

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/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java

Issue 551913002: Fix revert conflict from last commit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

Index: content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java

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

index 4e1498ee22ab4456702ad5e3276c73be13b35593..c6dab26384ef445c5c453dbd5e0f78be08541fea 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java

@@ -47,8 +47,12 @@ public class WebContentsObserverAndroidTest extends ContentShellTestBase {

waitForActiveShellToBeDoneLoading();

}

+ /*

@SmallTest

@Feature({"Navigation"})

+ http://crbug.com/411931

+ */

+ @DisabledTest

public void testDidFirstVisuallyNonEmptyPaint() throws Throwable {

TestWebContentsObserverAndroid observer = ThreadUtils.runOnUiThreadBlocking(

new Callable<TestWebContentsObserverAndroid>() {

« no previous file with comments | « no previous file | no next file » | no next file with comments »