Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(907)

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

Issue 11348361: Add insertion handle tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More findbugs :( Created 8 years 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
Index: content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
index 5c0df418e56cd27d65549af6b685aff491434844..d07c5147872c8e9b9a8902a170e21c9faf98255c 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
@@ -12,7 +12,6 @@ import java.util.concurrent.TimeUnit;
import org.chromium.base.test.util.UrlUtils;
import org.chromium.content.browser.test.util.DOMUtils;
import org.chromium.content.browser.test.util.JavaScriptUtils;
-import org.chromium.content.browser.test.util.TestContentViewClient;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnStartContentIntentHelper;
@@ -26,46 +25,9 @@ public class ContentDetectionTestBase extends ContentShellTestBase {
private static final int WAIT_TIMEOUT_SECONDS = 10;
- private ContentView mContentView;
private TestCallbackHelperContainer mCallbackHelper;
/**
- * Starts the content shell activity with the provided test url.
- * The url is synchronously loaded.
- * @param testUrl Test url to load.
- */
- protected void startActivityWithTestUrl(String testUrl) throws Throwable {
- ContentShellActivity activity = launchContentShellWithUrl(UrlUtils.getTestFileUrl(testUrl));
- assertNotNull(activity);
- assertTrue(waitForActiveShellToBeDoneLoading());
- mContentView = activity.getActiveShell().getContentView();
- assertEquals(UrlUtils.getTestFileUrl(testUrl), mContentView.getUrl());
- }
-
- /**
- * Starts the content shell activity with the provided etst url and optional command line
- * arguments to append.
- * The url is synchronously loaded.
- * @param testUrl Test url to load.
- * @param commandLineArgs Optional command line args to append when launching the activity.
- */
- protected void startActivityWithTestUrlAndCommandLineArgs(
- String testUrl, String[] commandLineArgs) throws Throwable {
- ContentShellActivity activity = launchContentShellWithUrlAndCommandLineArgs(
- UrlUtils.getTestFileUrl(testUrl), commandLineArgs);
- assertNotNull(activity);
- assertTrue(waitForActiveShellToBeDoneLoading());
- mContentView = activity.getActiveShell().getContentView();
- }
-
- /**
- * Returns the current ContentView.
- */
- protected ContentView getContentView() {
- return mContentView;
- }
-
- /**
* Returns the TestCallbackHelperContainer associated with this ContentView,
* or creates it lazily.
*/

Powered by Google App Engine
This is Rietveld 408576698