[Android] Add support for command-line flags via annotation.

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

Index: content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
index 950e772a112c7278a1a91fa0e5a28e0b91072e95..f68d54edc424390e5bcda729f04d80bb8806bcff 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
@@ -11,10 +11,10 @@ import android.test.suitebuilder.annotation.SmallTest;
 import junit.framework.Assert;
 
 import org.chromium.base.annotations.SuppressFBWarnings;
+import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content_public.browser.LoadUrlParams;
-import org.chromium.content_shell_apk.ContentShellActivity;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -98,13 +98,6 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
         setUpContentView(mTestController, "testController");
     }
 
-    @Override
-    protected ContentShellActivity launchContentShellWithUrl(String url) {
-        // Expose a global function "gc()" into pages.
-        return launchContentShellWithUrlAndCommandLineArgs(
-                url, new String[]{ "--js-flags=--expose-gc" });
-    }
-
     // Note that this requires that we can pass a JavaScript string to Java.
     protected String executeJavaScriptAndGetStringResult(String script) throws Throwable {
         executeJavaScript("testController.setStringValue(" + script + ");");
@@ -471,6 +464,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     // leak.
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
+    @CommandLineFlags.Add({"js-flags=--expose-gc"})
     public void testReturnedObjectIsGarbageCollected() throws Throwable {
         // Make sure V8 exposes "gc" property on the global object (enabled with --expose-gc flag)
         assertEquals("function", executeJavaScriptAndGetStringResult("typeof gc"));