content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java - Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split.

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java

Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Small fixes and findbugs line update Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java

deleted file mode 100644

index fb34e8474f7c83120196814bdf70ea67b46f42f8..0000000000000000000000000000000000000000

--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java

+++ /dev/null

@@ -1,59 +0,0 @@

-// 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;

-import android.util.Log;

-import org.chromium.base.test.util.UrlUtils;

-import org.chromium.content.browser.test.util.TestCallbackHelperContainer;

-import org.chromium.content_shell_apk.ContentShellActivity;

-import org.chromium.content_shell_apk.ContentShellTestBase;

-public class ContentViewTestBase extends ContentShellTestBase {

- protected TestCallbackHelperContainer mTestCallbackHelperContainer;

- /**

- * Sets up the ContentView and injects the supplied object. Intended to be called from setUp().

- */

- protected void setUpContentView(final Object object, final String name) throws Exception {

- // This starts the activity, so must be called on the test thread.

- final ContentShellActivity activity = launchContentShellWithUrl(

- UrlUtils.encodeHtmlDataUri("<html><head></head><body>test</body></html>"));

- waitForActiveShellToBeDoneLoading();

- // On the UI thread, load an empty page and wait for it to finish

- // loading so that the Java object is injected.

- try {

- runTestOnUiThread(new Runnable() {

- @Override

- public void run() {

- ContentView contentView = activity.getActiveContentView();

- contentView.getContentViewCore().addPossiblyUnsafeJavascriptInterface(object,

- name, null);

- mTestCallbackHelperContainer =

- new TestCallbackHelperContainer(contentView);

- }

- });

- loadDataSync(activity.getActiveContentView(),

- "<!DOCTYPE html><title></title>", "text/html", false);

- } catch (Throwable e) {

- throw new RuntimeException(

- "Failed to set up ContentView: " + Log.getStackTraceString(e));

- }

- /**

- * Loads data on the UI thread and blocks until onPageFinished is called.

- * TODO(cramya): Move method to a separate util file once UiUtils.java moves into base.

- */

- protected void loadDataSync(final ContentView contentView, final String data,

- final String mimeType, final boolean isBase64Encoded) throws Throwable {

- loadUrl(contentView, mTestCallbackHelperContainer, LoadUrlParams.createLoadDataParams(

- data, mimeType, isBase64Encoded));

- }