Refactoring JavaScript modal dialog.

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

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 841787a372dcfbb371fe9cf404386bfbcc1773f8..c7079ed0fe7470742d4d5504efdd74217cac7dce 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
@@ -127,15 +127,18 @@ public class TestCallbackHelperContainer {
         }
 
         /**
-         * Waits till the JavaScript evaluation finishes.
+         * Waits till the JavaScript evaluation finishes and returns true if a value was returned,
+         * false if it timed-out.
          */
-        public void waitUntilHasValue(long timeout, TimeUnit timeoutUnits)
+        public boolean waitUntilHasValue(long timeout, TimeUnit timeoutUnits)
                 throws InterruptedException, TimeoutException {
             waitUntilCriteria(getHasValueCriteria(), timeout, timeoutUnits);
+            return hasValue();
         }
 
-        public void waitUntilHasValue() throws InterruptedException, TimeoutException {
+        public boolean waitUntilHasValue() throws InterruptedException, TimeoutException {
             waitUntilCriteria(getHasValueCriteria());
+            return hasValue();
         }
 
         private void setRequestId(Integer requestId) {