Convert most of the rest of instrumentation tests in content

content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeActivityTestRule.java

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content_shell_apk.ContentShellActivity;
 import org.chromium.content_shell_apk.ContentShellActivityTestRule;
 import org.chromium.content_shell_apk.ContentShellTestCommon.TestCommonCallback;
 
 import java.lang.annotation.Annotation;
 
 /**
  * ActivityTestRule with common functionality for testing the Java Bridge.
  */
 public class JavaBridgeActivityTestRule
         extends ContentShellActivityTestRule implements TestCommonCallback<ContentShellActivity> {
     private JavaBridgeTestCommon mTestCommon;
+    private final boolean mSetup;
 
     public JavaBridgeActivityTestRule() {
+        this(true);
+    }
+
+    public JavaBridgeActivityTestRule(boolean setUp) {

[jbudorick, 2017/04/04 00:39:55]

Should this use https://codereview.chromium.org/2770393002/ once that lands?

[the real yoland, 2017/04/04 17:41:25]

Yes, will change to that once it lands

         super();
+        mSetup = setUp;
         mTestCommon = new JavaBridgeTestCommon(this);
     }
 
     /**
      * Sets up the ContentView. Intended to be called from setUp().
      */
-    private void setUpContentView() {
+    public void setUpContentView() {
         mTestCommon.setUpContentView();
     }
 
     public TestCallbackHelperContainer getTestCallBackHelperContainer() {
         return mTestCommon.getTestCallBackHelperContainer();
     }
 
     public void executeJavaScript(String script) throws Throwable {
         mTestCommon.executeJavaScript(script);
     }
@@ skipping 15 matching lines @@
 
     public void synchronousPageReload() throws Throwable {
         mTestCommon.synchronousPageReload();
     }
 
     @Override
     public Statement apply(final Statement base, Description desc) {
         return super.apply(new Statement() {
             @Override
             public void evaluate() throws Throwable {
-                setUpContentView();
+                if (mSetup) {
+                    setUpContentView();
+                }
                 base.evaluate();
             }
         }, desc);
     }
 }