Restructuring WebContents functions from ContentViewCore to WebContents.

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 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;
 
 /**
  * This class is used to provide callback hooks for tests and related classes.
  */
 public class TestCallbackHelperContainer {
     private final TestContentViewClient mTestContentViewClient;
     private TestWebContentsObserver mTestWebContentsObserver;
@@ skipping 82 matching lines @@
      */
     public static class OnEvaluateJavaScriptResultHelper extends CallbackHelper {
         private String mJsonResult;
 
         /**
          * Starts evaluation of a given JavaScript code on a given contentViewCore.
          * @param contentViewCore A ContentViewCore instance to be used.
          * @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);
                     }
                 };
             contentViewCore.evaluateJavaScript(code, callback);
             mJsonResult = null;
         }
 
         /**
@@ skipping 74 matching lines @@
     }
 
     public OnReceivedErrorHelper getOnReceivedErrorHelper() {
         return mTestWebContentsObserver.getOnReceivedErrorHelper();
     }
 
     public OnStartContentIntentHelper getOnStartContentIntentHelper() {
         return mTestContentViewClient.getOnStartContentIntentHelper();
     }
 }