Revert 160959 - [android_webview] Use AwContents loadUrl method instead of ContentViewCore.

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

 // Copyright (c) 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.android_webview.test;
 
 import android.app.Instrumentation;
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ skipping 56 matching lines @@
         getInstrumentation().waitForIdleSync();
         getInstrumentation().runOnMainSync(task);
         try {
             return task.get();
         } catch (ExecutionException e) {
             // Unwrap the cause of the exception and re-throw it.
             throw e.getCause();
         }
     }
 
-    protected void enableJavaScriptOnUiThread(final AwContents awContents) {
+    protected void enableJavaScriptOnUiThread(final ContentViewCore contentViewCore) {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                awContents.getContentViewCore().getContentSettings().setJavaScriptEnabled(true);
+                contentViewCore.getContentSettings().setJavaScriptEnabled(true);
             }
         });
     }
 
     /**
      * Loads url on the UI thread and blocks until onPageFinished is called.
      */
-    protected void loadUrlSync(final AwContents awContents,
+    protected void loadUrlSync(final ContentViewCore contentViewCore,
                                CallbackHelper onPageFinishedHelper,
                                final String url) throws Throwable {
         int currentCallCount = onPageFinishedHelper.getCallCount();
-        loadUrlAsync(awContents, url);
+        loadUrlAsync(contentViewCore, url);
         onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
                 TimeUnit.SECONDS);
     }
 
     /**
      * Loads url on the UI thread but does not block.
      */
-    protected void loadUrlAsync(final AwContents awContents,
+    protected void loadUrlAsync(final ContentViewCore contentViewCore,
                                 final String url) throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                awContents.getContentViewCore().loadUrl(new LoadUrlParams(url));
+                contentViewCore.loadUrl(new LoadUrlParams(url));
             }
         });
     }
 
     /**
      * Loads data on the UI thread and blocks until onPageFinished is called.
      */
-    protected void loadDataSync(final AwContents awContents,
+    protected void loadDataSync(final ContentViewCore contentViewCore,
                                 CallbackHelper onPageFinishedHelper,
                                 final String data, final String mimeType,
                                 final boolean isBase64Encoded) throws Throwable {
         int currentCallCount = onPageFinishedHelper.getCallCount();
-        loadDataAsync(awContents, data, mimeType, isBase64Encoded);
+        loadDataAsync(contentViewCore, data, mimeType, isBase64Encoded);
         onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
                 TimeUnit.SECONDS);
     }
 
     /**
      * Loads data on the UI thread but does not block.
      */
-    protected void loadDataAsync(final AwContents awContents, final String data,
+    protected void loadDataAsync(final ContentViewCore contentViewCore, final String data,
                                  final String mimeType, final boolean isBase64Encoded)
             throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                awContents.loadUrl(LoadUrlParams.createLoadDataParams(
+                contentViewCore.loadUrl(LoadUrlParams.createLoadDataParams(
                         data, mimeType, isBase64Encoded));
             }
         });
     }
 
     protected AwTestContainerView createAwTestContainerView(final boolean incognito,
-            final AwContentsClient awContentsClient) {
+            final AwContentsClient contentsClient) {
         return createAwTestContainerView(incognito, new AwTestContainerView(getActivity()),
-                awContentsClient);
+                contentsClient);
     }
 
     protected AwTestContainerView createAwTestContainerView(final boolean incognito,
             final AwTestContainerView testContainerView,
-            final AwContentsClient awContentsClient) {
+            final AwContentsClient contentsClient) {
         ContentViewCore contentViewCore = new ContentViewCore(
                 getActivity(), ContentViewCore.PERSONALITY_VIEW);
         testContainerView.initialize(contentViewCore,
                 new AwContents(testContainerView, testContainerView.getInternalAccessDelegate(),
-                contentViewCore, awContentsClient, new ActivityNativeWindow(getActivity()),
+                contentViewCore, contentsClient, new ActivityNativeWindow(getActivity()),
                 incognito, false));
         getActivity().addView(testContainerView);
         return testContainerView;
     }
 
     protected AwTestContainerView createAwTestContainerViewOnMainSync(
             final AwContentsClient client) throws Exception {
         return createAwTestContainerViewOnMainSync(NORMAL_VIEW, client);
     }
 
     protected AwTestContainerView createAwTestContainerViewOnMainSync(
             final boolean incognito,
             final AwContentsClient client) throws Exception {
         final AtomicReference<AwTestContainerView> testContainerView =
                 new AtomicReference<AwTestContainerView>();
         final Context context = getActivity();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 testContainerView.set(createAwTestContainerView(incognito, client));
             }
         });
         return testContainerView.get();
     }
 
-    protected void destroyAwContentsOnMainSync(final AwContents awContents) {
-        if (awContents == null) return;
+    protected void destroyAwContentsOnMainSync(final AwContents contents) {
+        if (contents == null) return;
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                awContents.destroy();
+                contents.destroy();
             }
         });
     }
 
-    protected String getTitleOnUiThread(final AwContents awContents) throws Throwable {
+    protected String getTitleOnUiThread(final ContentViewCore contentViewCore) throws Throwable {
         return runTestOnUiThreadAndGetResult(new Callable<String>() {
             @Override
             public String call() throws Exception {
-                return awContents.getContentViewCore().getTitle();
+                return contentViewCore.getTitle();
             }
         });
     }
 
     protected ContentSettings getContentSettingsOnUiThread(
-            final AwContents awContents) throws Throwable {
+            final ContentViewCore contentViewCore) throws Throwable {
         return runTestOnUiThreadAndGetResult(new Callable<ContentSettings>() {
             @Override
             public ContentSettings call() throws Exception {
-                return awContents.getContentViewCore().getContentSettings();
+                return contentViewCore.getContentSettings();
             }
         });
     }
 
     protected AwSettings getAwSettingsOnUiThread(
             final AwContents awContents) throws Throwable {
         return runTestOnUiThreadAndGetResult(new Callable<AwSettings>() {
             @Override
             public AwSettings call() throws Exception {
                 return awContents.getSettings();
             }
         });
     }
 
     /**
      * Executes the given snippet of JavaScript code within the given ContentView. Returns the
      * result of its execution in JSON format.
      */
-    protected String executeJavaScriptAndWaitForResult(final AwContents awContents,
+    protected String executeJavaScriptAndWaitForResult(final ContentViewCore core,
             TestAwContentsClient viewClient, final String code) throws Throwable {
         final AtomicInteger requestId = new AtomicInteger();
         TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper
                 onEvaluateJavaScriptResultHelper = viewClient.getOnEvaluateJavaScriptResultHelper();
         int currentCallCount = onEvaluateJavaScriptResultHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                requestId.set(awContents.getContentViewCore().evaluateJavaScript(code));
+                requestId.set(core.evaluateJavaScript(code));
             }
         });
         onEvaluateJavaScriptResultHelper.waitForCallback(currentCallCount);
         Assert.assertEquals("Response ID mismatch when evaluating JavaScript.",
                 requestId.get(), onEvaluateJavaScriptResultHelper.getId());
         return onEvaluateJavaScriptResultHelper.getJsonResult();
     }
 }