| 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 d5e5485729cec1ed52406b661f2cd4c81f2b194b..75ad2fe4b4a5b24baa3b176e5864317c8979e5b4 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
|
| @@ -74,8 +74,9 @@ public class ContentShellTestBase
|
| * Starts the content shell activity with the provided test url.
|
| * The url is synchronously loaded.
|
| * @param url Test url to load.
|
| + * @throws InterruptedException
|
| */
|
| - protected void startActivityWithTestUrl(String url) throws Throwable {
|
| + protected void startActivityWithTestUrl(String url) throws InterruptedException {
|
| launchContentShellWithUrl(UrlUtils.getIsolatedTestFileUrl(url));
|
| assertNotNull(getActivity());
|
| waitForActiveShellToBeDoneLoading();
|
| @@ -203,6 +204,7 @@ public class ContentShellTestBase
|
| CriteriaHelper.pollForCriteria(new Criteria() {
|
| @Override
|
| public boolean isSatisfied() {
|
| + updateFailureReason(Float.toString(getContentViewCore().getScale()));
|
| return getContentViewCore().getScale() == expectedScale;
|
| }
|
| });
|
|
|