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

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

Issue 1288643003: Added Signin Parameters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sami's LGTM Nits Created 5 years, 4 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
Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
index 3232702d79cd271a7fa64c21797181ce58672cb8..4aa11a85567228d2d81292610f1ceadf392f0755 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
@@ -25,6 +25,7 @@ import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.base.test.BaseActivityInstrumentationTestCase;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.PerfTest;
+import org.chromium.base.test.util.parameter.BaseParameter;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.ChromeApplication;
@@ -59,6 +60,9 @@ import org.chromium.chrome.test.util.ApplicationTestUtils;
import org.chromium.chrome.test.util.ChromeTabUtils;
import org.chromium.chrome.test.util.MenuUtils;
import org.chromium.chrome.test.util.NewTabPageTestUtils;
+import org.chromium.chrome.test.util.parameters.AddFakeAccountToAppParameter;
+import org.chromium.chrome.test.util.parameters.AddFakeAccountToOsParameter;
+import org.chromium.chrome.test.util.parameters.AddGoogleAccountToOsParameter;
import org.chromium.content.browser.test.util.CallbackHelper;
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -73,6 +77,7 @@ import java.io.File;
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Semaphore;
@@ -833,6 +838,18 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
endPerfTest(perfTagAnalysisString);
}
+ @Override
+ protected Map<String, BaseParameter> createAvailableParameters() {
+ Map<String, BaseParameter> availableParameters = super.createAvailableParameters();
+ availableParameters.put(AddFakeAccountToAppParameter.PARAMETER_TAG,
+ new AddFakeAccountToAppParameter(getParameterReader(), getInstrumentation()));
+ availableParameters.put(AddFakeAccountToOsParameter.PARAMETER_TAG,
+ new AddFakeAccountToOsParameter(getParameterReader(), getInstrumentation()));
+ availableParameters.put(AddGoogleAccountToOsParameter.PARAMETER_TAG,
+ new AddGoogleAccountToOsParameter(getParameterReader(), getInstrumentation()));
+ return availableParameters;
+ }
+
/**
* Waits till the ContentViewCore receives the expected page scale factor
* from the compositor and asserts that this happens.

Powered by Google App Engine
This is Rietveld 408576698