Restructuring WebContents functions from ContentViewCore to WebContents.

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 1fb05e7a14fafb05a5bd7434b46409e3e2f3d86f..b1bc80ba9602ff3fa773db9fca4b05f896d86d4e 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
@@ -7,6 +7,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 java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -109,8 +110,8 @@ public class TestCallbackHelperContainer {
          * @param code A JavaScript code to be evaluated.
          */
         public void evaluateJavaScript(ContentViewCore contentViewCore, String code) {
-            ContentViewCore.JavaScriptCallback callback =
-                new ContentViewCore.JavaScriptCallback() {
+            JavaScriptCallback callback =
+                new JavaScriptCallback() {
                     @Override
                     public void handleJavaScriptResult(String jsonResult) {
                         notifyCalled(jsonResult);