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

Unified Diff: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeTabbedActivityTestBase.java

Issue 1229913005: Remove ChromeTabbedActivityTestBase.startActivityCompletely(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeTabbedActivityTestBase.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeTabbedActivityTestBase.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeTabbedActivityTestBase.java
index f5f745347aaeb2c601c0ab7214a49b3e3dc8f94d..44cf0b7e22c50e59e787e801fb874550953e1627 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeTabbedActivityTestBase.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeTabbedActivityTestBase.java
@@ -4,11 +4,7 @@
package org.chromium.chrome.test;
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Intent;
import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
import org.chromium.base.test.util.CommandLineFlags;
@@ -89,19 +85,6 @@ public abstract class ChromeTabbedActivityTestBase extends
}
}
- @Override
- protected void startActivityCompletely(Intent intent) {
- Instrumentation.ActivityMonitor monitor = getInstrumentation().addMonitor(
- ChromeTabbedActivity.class.getName(), null, false);
- Activity activity = getInstrumentation().startActivitySync(intent);
- assertNotNull("Main activity did not start", activity);
- ChromeTabbedActivity tabbedActivity = (ChromeTabbedActivity)
- monitor.waitForActivityWithTimeout(ACTIVITY_START_TIMEOUT_MS);
- assertNotNull("ChromeTabbedActivity did not start", tabbedActivity);
- setActivity(tabbedActivity);
- Log.d(TAG, "startActivityCompletely <<");
- }
-
/**
* Long presses the view, selects an item from the context menu, and
* asserts that a new tab is opened and is incognito iff expectIncognito is true.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698