Removing ContentViewCore dependencies from direct WebContents functions.

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 org.chromium.content_public.browser.WebContents;
 
 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;
 
     public TestCallbackHelperContainer(final ContentViewCore contentViewCore) {
         mTestContentViewClient = new TestContentViewClient();
         contentViewCore.setContentViewClient(mTestContentViewClient);
         // TODO(yfriedman): Change callers to be executed on the UI thread. Unfortunately this is
         // super convenient as the caller is nearly always on the test thread which is fine to block
         // and it's cumbersome to keep bouncing to the UI thread.
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mTestWebContentsObserver = new TestWebContentsObserver(contentViewCore);
+                mTestWebContentsObserver = new TestWebContentsObserver(contentViewCore
+                        .getWebContents());
             }
         });
     }
 
     protected TestCallbackHelperContainer(
             TestContentViewClient viewClient, TestWebContentsObserver contentsObserver) {
         mTestContentViewClient = viewClient;
         mTestWebContentsObserver = contentsObserver;
     }
 
@@ skipping 56 matching lines @@
 
     /**
      * CallbackHelper for OnEvaluateJavaScriptResult.
      * This class wraps the evaluation of JavaScript code allowing test code to
      * synchronously evaluate JavaScript and then test the result.
      */
     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.
+         * Starts evaluation of a given JavaScript code on a given webContents.
+         * @param webContents A WebContents instance to be used.
          * @param code A JavaScript code to be evaluated.
          */
-        public void evaluateJavaScript(ContentViewCore contentViewCore, String code) {
+        public void evaluateJavaScript(WebContents webContents, String code) {
             JavaScriptCallback callback =
                 new JavaScriptCallback() {
                     @Override
                     public void handleJavaScriptResult(String jsonResult) {
                         notifyCalled(jsonResult);
                     }
                 };
-            contentViewCore.evaluateJavaScript(code, callback);
+            webContents.evaluateJavaScript(code, callback);
             mJsonResult = null;
         }
 
         /**
          * Returns true if the evaluation started by evaluateJavaScript() has completed.
          */
         public boolean hasValue() {
             return mJsonResult != null;
         }
 
@@ skipping 68 matching lines @@
     }
 
     public OnReceivedErrorHelper getOnReceivedErrorHelper() {
         return mTestWebContentsObserver.getOnReceivedErrorHelper();
     }
 
     public OnStartContentIntentHelper getOnStartContentIntentHelper() {
         return mTestContentViewClient.getOnStartContentIntentHelper();
     }
 }