chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java - Issue 1387633002: Update instrumentation tests to use PreTestHooks for policies

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.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

« chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java ('K') | « chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java ('k') | components/policy.gypi » ('j') | components/policy/android/javatests/src/org/chromium/policy/test/PolicyData.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java

diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java

index 311b6d0bec14552e6bb1f98b81f3b33f99c8fbed..cc9571bc3c57d4dab2f5631c7655f01cdf8b8147 100644

--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java

+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java

@@ -25,6 +25,7 @@

import org.chromium.chrome.test.util.parameters.AddGoogleAccountToOsParameter;

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

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

+import org.chromium.policy.test.annotations.Policies;

import java.util.HashMap;

import java.util.Map;

@@ -137,6 +138,7 @@ public void setUp() throws Exception {

super.setUp();

mContext = getInstrumentation().getTargetContext();

CommandLineFlags.setUp(mContext, getClass().getMethod(getName()));

+ Policies.getRegistrationHook().run(mContext, getClass().getMethod(getName()));

ApplicationTestUtils.setUp(mContext, true, true);

// Make the DocumentTabModelSelector use a mocked out directory so that test runs don't