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 8206ff5d02ad5f38d3fb7b9a9e5918d92399bcc1..23675f990603955a28db12d66afaa65c8b28d943 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 @@ public class ContentShellTestBase |
updateFailureReason("Shell is null."); |
return false; |
} |
- if (TextUtils.isEmpty(shell.getContentViewCore().getWebContents().getUrl())) { |
- updateFailureReason("Shell's URL is empty or null."); |
+ if (shell.isLoading()) { |
+ updateFailureReason("Shell is still loading."); |
return false; |
} |
- if (!shell.getContentViewCore().getWebContents().isReady()) { |
- updateFailureReason("Shell's view is not ready."); |
+ if (TextUtils.isEmpty(shell.getContentViewCore().getWebContents().getUrl())) { |
+ updateFailureReason("Shell's URL is empty or null."); |
return false; |
} |
return true; |