Restructuring WebContents functions from ContentViewCore to WebContents.

content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

 // Copyright 2013 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.webcontents;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
+import org.chromium.content_public.browser.JavaScriptCallback;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationTransitionDelegate;
 import org.chromium.content_public.browser.WebContents;
 
 /**
  * The WebContentsImpl Java wrapper to allow communicating with the native WebContentsImpl
  * object.
  */
 @JNINamespace("content")
 //TODO(tedchoc): Remove the package restriction once this class moves to a non-public content
@@ skipping 141 matching lines @@
     }
 
     @Override
     public void setNavigationTransitionDelegate(NavigationTransitionDelegate delegate) {
         mNavigationTransitionDelegate = delegate;
     }
 
     /**
      * Inserts the provided markup sandboxed into the frame.
      */
+    @Override

[AKVT, 2014/08/13 16:15:48]

Corrected the Override issues from previous patch.

     public void setupTransitionView(String markup) {
         nativeSetupTransitionView(mNativeWebContentsAndroid, markup);
     }
 
     /**
      * Hides transition elements specified by the selector, and activates any
      * exiting-transition stylesheets.
      */
+    @Override

[AKVT, 2014/08/13 16:15:48]

ditto

     public void beginExitTransition(String cssSelector) {
         nativeBeginExitTransition(mNativeWebContentsAndroid, cssSelector);
     }
 
     @CalledByNative
     private void didDeferAfterResponseStarted(String markup, String cssSelector,
             String enteringColor) {
         if (mNavigationTransitionDelegate != null ) {
             mNavigationTransitionDelegate.didDeferAfterResponseStarted(markup,
                     cssSelector, enteringColor);
@@ skipping 13 matching lines @@
         }
     }
 
     @CalledByNative
     private void didStartNavigationTransitionForFrame(long frameId) {
         if (mNavigationTransitionDelegate != null ) {
             mNavigationTransitionDelegate.didStartNavigationTransitionForFrame(frameId);
         }
     }
 
+    @Override
+    public void evaluateJavaScript(String script, JavaScriptCallback callback,
+            boolean startRenderer) {
+         nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback, true);
+    }
+
+    @CalledByNative
+    private static void onEvaluateJavaScriptResult(
+            String jsonResult, JavaScriptCallback callback) {
+        callback.handleJavaScriptResult(jsonResult);
+    }
+
     private native String nativeGetTitle(long nativeWebContentsAndroid);
     private native String nativeGetVisibleURL(long nativeWebContentsAndroid);
     private native void nativeStop(long nativeWebContentsAndroid);
     private native void nativeInsertCSS(long nativeWebContentsAndroid, String css);
     private native void nativeOnHide(long nativeWebContentsAndroid);
     private native void nativeOnShow(long nativeWebContentsAndroid);
     private native int nativeGetBackgroundColor(long nativeWebContentsAndroid);
     private native void nativeAddStyleSheetByURL(long nativeWebContentsAndroid,
             String url);
     private native void nativeShowInterstitialPage(long nativeWebContentsAndroid,
             String url, long nativeInterstitialPageDelegateAndroid);
     private native boolean nativeIsShowingInterstitialPage(long nativeWebContentsAndroid);
     private native boolean nativeIsRenderWidgetHostViewReady(long nativeWebContentsAndroid);
     private native void nativeExitFullscreen(long nativeWebContentsAndroid);
     private native void nativeUpdateTopControlsState(long nativeWebContentsAndroid,
             boolean enableHiding, boolean enableShowing, boolean animate);
     private native void nativeShowImeIfNeeded(long nativeWebContentsAndroid);
     private native void nativeScrollFocusedEditableNodeIntoView(long nativeWebContentsAndroid);
     private native void nativeSelectWordAroundCaret(long nativeWebContentsAndroid);
     private native String nativeGetURL(long nativeWebContentsAndroid);
     private native boolean nativeIsIncognito(long nativeWebContentsAndroid);
     private native void nativeResumeResponseDeferredAtStart(long nativeWebContentsAndroid);
     private native void nativeSetHasPendingNavigationTransitionForTesting(
             long nativeWebContentsAndroid);
     private native void nativeSetupTransitionView(long nativeWebContentsAndroid,
             String markup);
     private native void nativeBeginExitTransition(long nativeWebContentsAndroid,
             String cssSelector);
+    private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid,
+            String script, JavaScriptCallback callback, boolean startRenderer);
 }