Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / public / test / android / javatests / src / org / chromium / content / browser / test / util / TestCallbackHelperContainer.java

diff --git a/src/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java b/src/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
index b1bc80b..dbd71eb 100644 (file)
--- a/src/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
+++ b/src/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
@@ -8,6 +8,7 @@ package org.chromium.content.browser.test.util;
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.JavaScriptCallback;
+import org.chromium.content_public.browser.WebContents;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -28,7 +29,8 @@ public class TestCallbackHelperContainer {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mTestWebContentsObserver = new TestWebContentsObserver(contentViewCore);
+                mTestWebContentsObserver = new TestWebContentsObserver(contentViewCore
+                        .getWebContents());
             }
         });
     }
@@ -105,19 +107,19 @@ public class TestCallbackHelperContainer {
         private String mJsonResult;
 
         /**
-         * Starts evaluation of a given JavaScript code on a given contentViewCore.
-         * @param contentViewCore A ContentViewCore instance to be used.
+         * Starts evaluation of a given JavaScript code on a given webContents.
+         * @param webContents A WebContents instance to be used.
          * @param code A JavaScript code to be evaluated.
          */
-        public void evaluateJavaScript(ContentViewCore contentViewCore, String code) {
+        public void evaluateJavaScript(WebContents webContents, String code) {
             JavaScriptCallback callback =
-                new JavaScriptCallback() {
+                    new JavaScriptCallback() {
                     @Override
-                    public void handleJavaScriptResult(String jsonResult) {
-                        notifyCalled(jsonResult);
-                    }
-                };
-            contentViewCore.evaluateJavaScript(code, callback);
+                        public void handleJavaScriptResult(String jsonResult) {
+                            notifyCalled(jsonResult);
+                        }
+                    };
+            webContents.evaluateJavaScript(code, callback);
             mJsonResult = null;
         }