Restructuring WebContents functions from ContentViewCore to WebContents.

content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.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;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.content_public.browser.JavaScriptCallback;
 
 /**
  * Part of the test suite for the WebView's Java Bridge.
  *
  * Ensures that injected objects are exposed to child frames as well as the
  * main frame.
  */
 public class JavaBridgeChildFrameTest extends JavaBridgeTestBase {
     private class TestController extends Controller {
         private String mStringValue;
@@ skipping 76 matching lines @@
                 executeJavaScriptAndGetResult(getContentViewCore(), "queryProperties(window)"));
         assertEquals("\"undefined / undefined\"",
                 executeJavaScriptAndGetResult(getContentViewCore(),
                         "queryProperties(window.frames[0])"));
     }
 
     private String executeJavaScriptAndGetResult(final ContentViewCore contentViewCore,
             final String script) throws Throwable {
         final String[] result = new String[1];
         class ResultCallback extends JavaBridgeTestBase.Controller
-                implements ContentViewCore.JavaScriptCallback {
+                implements JavaScriptCallback {
             @Override
             public void handleJavaScriptResult(String jsonResult) {
                 result[0] = jsonResult;
                 notifyResultIsReady();
             }
         }
         final ResultCallback resultCallback = new ResultCallback();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 contentViewCore.evaluateJavaScript(script, resultCallback);
             }
         });
         resultCallback.waitForResult();
         return result[0];
     }
 }