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

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

Issue 1387633002: Update instrumentation tests to use PreTestHooks for policies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, replace bundle manipulation with a simple variable Created 5 years, 2 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/ChromeInstrumentationTestRunner.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
index 16cfa52eb617d161d75c280cfac7c71aaed4cab4..2abc1717fbf47f2923d4722ff42eb589fc695a90 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
@@ -19,6 +19,7 @@
import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.chrome.test.util.DisableInTabbedMode;
import org.chromium.net.test.BaseHttpTestServer;
+import org.chromium.policy.test.annotations.Policies;
import org.chromium.ui.base.DeviceFormFactor;
import java.io.File;
@@ -214,6 +215,8 @@ protected void addTestHooks(BaseTestResult result) {
super.addTestHooks(result);
result.addSkipCheck(new DisableInTabbedModeSkipCheck());
result.addSkipCheck(new ChromeRestrictionSkipCheck());
+
+ result.addPreTestHook(Policies.getRegistrationHook());
Yaron 2015/10/16 17:51:52 Do all chrome tests need these policies set up? Co
dgn 2015/10/20 10:09:46 We want to set the cached policies before the appl
}
private class ChromeRestrictionSkipCheck extends RestrictionSkipCheck {

Powered by Google App Engine
This is Rietveld 408576698