[Android] Move the java content/ package to content_public/ to start the split.

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
deleted file mode 100644
index 9576fb5682ae183776fa72968dded62392dca732..0000000000000000000000000000000000000000
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
+++ /dev/null
@@ -1,87 +0,0 @@
-// 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 junit.framework.Assert;
-
-import static org.chromium.base.test.util.ScalableTimeout.ScaleTimeout;
-
-import org.chromium.base.ThreadUtils;
-import org.chromium.content.browser.ContentView;
-import org.chromium.content.browser.ContentViewCore;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Collection of JavaScript utilities.
- */
-public class JavaScriptUtils {
-    private static final long EVALUATION_TIMEOUT_SECONDS = ScaleTimeout(5);
-
-    /**
-     * Executes the given snippet of JavaScript code within the given ContentView.
-     * Returns the result of its execution in JSON format.
-     */
-    public static String executeJavaScriptAndWaitForResult(
-            final ContentView view, TestCallbackHelperContainer viewClient,
-            final String code) throws InterruptedException, TimeoutException {
-        return executeJavaScriptAndWaitForResult(
-                view.getContentViewCore(),
-                viewClient.getOnEvaluateJavaScriptResultHelper(),
-                code);
-    }
-
-    /**
-     * Executes the given snippet of JavaScript code within the given ContentViewCore.
-     * Does not depend on ContentView and TestCallbackHelperContainer.
-     * Returns the result of its execution in JSON format.
-     */
-    public static String executeJavaScriptAndWaitForResult(
-            final ContentViewCore viewCore,
-            final TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper helper,
-            final String code) throws InterruptedException, TimeoutException {
-        return executeJavaScriptAndWaitForResult(
-                viewCore, helper, code, EVALUATION_TIMEOUT_SECONDS, TimeUnit.SECONDS);
-    }
-
-    /**
-     * Executes the given snippet of JavaScript code within the given ContentViewCore.
-     * Does not depend on ContentView and TestCallbackHelperContainer.
-     * Returns the result of its execution in JSON format.
-     */
-    public static String executeJavaScriptAndWaitForResult(
-            final ContentViewCore viewCore,
-            final TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper helper,
-            final String code,
-            final long timeout, final TimeUnit timeoutUnits)
-                    throws InterruptedException, TimeoutException {
-        // Calling this from the UI thread causes it to time-out: the UI thread being blocked won't
-        // have a chance to process the JavaScript eval response).
-        Assert.assertFalse("Executing JavaScript should be done from the test thread, "
-                + " not the UI thread", ThreadUtils.runningOnUiThread());
-        ThreadUtils.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                helper.evaluateJavaScript(viewCore, code);
-            }
-        });
-        helper.waitUntilHasValue(timeout, timeoutUnits);
-        Assert.assertTrue("Failed to retrieve JavaScript evaluation results.", helper.hasValue());
-        return helper.getJsonResultAndClear();
-    }
-
-    /**
-     * Executes the given snippet of JavaScript code but does not wait for the result.
-     */
-    public static void executeJavaScript(final ContentView view, final String code) {
-        ThreadUtils.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.evaluateJavaScript(code);
-            }
-        });
-    }
-}