chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java - Issue 879993002: [Android] Add support for command-line flags via annotation.

Unified Diff: chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

Issue 879993002: [Android] Add support for command-line flags via annotation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix gtests Created 5 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

« base/test/android/javatests/src/org/chromium/base/test/util/CommandLineFlags.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogTest.java ('k') | chrome/chrome_shell_test_apk.isolate » ('j') | chrome/chrome_shell_test_apk.isolate » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

diff --git a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

index cff6c76ee8fc2dc81b85a9781bd59a604a0120f2..9fc675f2ab138f92bff7247f81f64404594b0328 100644

--- a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

+++ b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

@@ -10,17 +10,19 @@ import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.net.Uri;

-import android.test.ActivityInstrumentationTestCase2;

import android.text.TextUtils;

import android.util.Log;

import org.chromium.base.CommandLine;

import org.chromium.base.ThreadUtils;

import org.chromium.base.library_loader.ProcessInitException;

+import org.chromium.base.test.BaseActivityInstrumentationTestCase;

+import org.chromium.base.test.util.CommandLineFlags;

import org.chromium.chrome.test.util.ApplicationData;

import org.chromium.content.browser.BrowserStartupController;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

+import org.chromium.content.common.ContentSwitches;

import org.chromium.content_public.browser.LoadUrlParams;

import java.util.concurrent.atomic.AtomicBoolean;

@@ -28,7 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean;

/**

* Base test class for all ChromeShell based tests.

-public class ChromeShellTestBase extends ActivityInstrumentationTestCase2<ChromeShellActivity> {

+@CommandLineFlags.Add({ContentSwitches.ENABLE_TEST_INTENTS})

Ted C 2015/01/29 00:39:51 if there is only one flag, you should be able to d

jbudorick 2015/01/29 04:46:45 Done.

+public class ChromeShellTestBase extends BaseActivityInstrumentationTestCase<ChromeShellActivity> {

/** The maximum time the waitForActiveShellToBeDoneLoading method will wait. */

private static final long WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT = scaleTimeout(10000);

private static final String TAG = "ChromeShellTestBase";