[Android] Remove startRender from evaluateJavaScript

Always start a renderer if one does not already exist.
The check is cheap so no need for a parameter to control it.

BUG=

Review URL: https://codereview.chromium.org/570783002

Cr-Commit-Position: refs/heads/master@{#294985}

android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -1713,14 +1713,12 @@ public class AwContents {
             };
         }
 
-        mWebContents.evaluateJavaScript(script, jsCallback, false);
+        mWebContents.evaluateJavaScript(script, jsCallback);
     }
 
-    /**
-     * @see ContentViewCore.evaluateJavaScriptEvenIfNotYetNavigated(String)
-     */
+    // TODO(boliu): Remove this once Android side no longer calls this.
     public void evaluateJavaScriptEvenIfNotYetNavigated(String script) {
-        mWebContents.evaluateJavaScript(script, null, true);
+        mWebContents.evaluateJavaScript(script, null);
     }
 
     //--------------------------------------------------------------------------------------------

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

@@ -400,8 +400,7 @@ public class AwContentsTest extends AwTestBase {
                 awSettings.setJavaScriptEnabled(true);
                 awContents.addPossiblyUnsafeJavascriptInterface(
                         new JavaScriptObject(callback), "bridge", null);
-                awContents.evaluateJavaScriptEvenIfNotYetNavigated(
-                        "javascript:window.bridge.run();");
+                awContents.evaluateJavaScript("javascript:window.bridge.run();", null);
             }
         });
         callback.waitForCallback(0, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);

content/browser/web_contents/web_contents_android.cc

@@ -343,12 +343,11 @@ void WebContentsAndroid::DidStartNavigationTransitionForFrame(int64 frame_id) {
 void WebContentsAndroid::EvaluateJavaScript(JNIEnv* env,
                                             jobject obj,
                                             jstring script,
-                                            jobject callback,
-                                            jboolean start_renderer) {
+                                            jobject callback) {
   RenderViewHost* rvh = web_contents_->GetRenderViewHost();
   DCHECK(rvh);
 
-  if (start_renderer && !rvh->IsRenderViewLive()) {
+  if (!rvh->IsRenderViewLive()) {
     if (!static_cast<WebContentsImpl*>(web_contents_)->
         CreateRenderViewForInitialEmptyDocument()) {
       LOG(ERROR) << "Failed to create RenderView in EvaluateJavaScript";

content/browser/web_contents/web_contents_android.h

@@ -88,8 +88,7 @@ class CONTENT_EXPORT WebContentsAndroid
   void EvaluateJavaScript(JNIEnv* env,
                           jobject obj,
                           jstring script,
-                          jobject callback,
-                          jboolean start_renderer);
+                          jobject callback);
 
  private:
   RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

@@ -1214,18 +1214,7 @@ public class ContentViewCore
      */
     public void evaluateJavaScript(String script, JavaScriptCallback callback) {
         assert mWebContents != null;
-        mWebContents.evaluateJavaScript(script, callback, false);
-    }
-
-    /**
-     * Injects the passed Javascript code in the current page and evaluates it.
-     * If there is no page existing, a new one will be created.
-     *
-     * @param script The Javascript to execute.
-     */
-    public void evaluateJavaScriptEvenIfNotYetNavigated(String script) {
-        assert mWebContents != null;
-        mWebContents.evaluateJavaScript(script, null, true);
+        mWebContents.evaluateJavaScript(script, callback);
     }
 
     /**

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

@@ -217,9 +217,8 @@ import org.chromium.content_public.browser.WebContents;
     }
 
     @Override
-    public void evaluateJavaScript(String script, JavaScriptCallback callback,
-            boolean startRenderer) {
-         nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback, true);
+    public void evaluateJavaScript(String script, JavaScriptCallback callback) {
+         nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback);
     }
 
     @CalledByNative
@@ -258,5 +257,5 @@ import org.chromium.content_public.browser.WebContents;
     private native void nativeBeginExitTransition(long nativeWebContentsAndroid,
             String cssSelector);
     private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid,
-            String script, JavaScriptCallback callback, boolean startRenderer);
+            String script, JavaScriptCallback callback);
 }

content/public/android/java/src/org/chromium/content_public/browser/WebContents.java

@@ -160,9 +160,7 @@ public interface WebContents {
      *                 result will be json encoded and passed as the parameter, and the call
      *                 will be made on the main thread.
      *                 If no result is required, pass null.
-     * @param startRenderer Tells whether to start Renderer or not for initial empty document
      */
-    public void evaluateJavaScript(String script, JavaScriptCallback callback,
-            boolean startRenderer);
+    public void evaluateJavaScript(String script, JavaScriptCallback callback);
 
 }