content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java - Issue 2231433002: Revert of Remove unnecessary page loading in ContentShellActivity

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/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

Issue 2231433002: Revert of Remove unnecessary page loading in ContentShellActivity (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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/shell/android/java/src/org/chromium/content_shell/ShellManager.java ('k') | content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

index 23675f990603955a28db12d66afaa65c8b28d943..8206ff5d02ad5f38d3fb7b9a9e5918d92399bcc1 100644

--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

@@ -121,12 +121,12 @@

updateFailureReason("Shell is null.");

return false;

}

- if (shell.isLoading()) {

- updateFailureReason("Shell is still loading.");

+ if (TextUtils.isEmpty(shell.getContentViewCore().getWebContents().getUrl())) {

+ updateFailureReason("Shell's URL is empty or null.");

return false;

}

- if (TextUtils.isEmpty(shell.getContentViewCore().getWebContents().getUrl())) {

- updateFailureReason("Shell's URL is empty or null.");

+ if (!shell.getContentViewCore().getWebContents().isReady()) {

+ updateFailureReason("Shell's view is not ready.");

return false;

}

return true;