Update instrumentation tests to use PreTestHooks for policies

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

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()));

[Bernhard Bauer, 2015/11/06 10:25:34]

Why do we need to do this if we already add it to the test runners?

[dgn, 2015/11/06 16:07:08]

We don't. I followed what was done with CommandLineFlags, but this is not needed
for Policies here. Removed.

         ApplicationTestUtils.setUp(mContext, true, true);
 
         // Make the DocumentTabModelSelector use a mocked out directory so that test runs don't