Auto convert content shell tests to JUnit4

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

 // Copyright 2012 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 static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
 import android.support.test.filters.SmallTest;
 
@@ skipping 163 matching lines @@
         assertEquals("I'm here", mTestController.waitForStringValue());
         synchronousPageReload();
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof testObject"));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testRemoveObjectNotAdded() throws Throwable {
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 getTestCallBackHelperContainer().getOnPageFinishedHelper();
+

[boliu, 2017/03/10 18:32:32]

remove this empty line change

[the real yoland, 2017/03/10 19:31:58]

Done

         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 getContentViewCore().removeJavascriptInterface("foo");
                 getContentViewCore().getWebContents().getNavigationController().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof foo"));
@@ skipping 791 matching lines @@
         executeJavaScript("testObject1.method()");
         assertEquals(1, mTestController.waitForIntValue());
         executeJavaScript("testObject2.method()");
         assertEquals(2, mTestController.waitForIntValue());
         executeJavaScript("testObject1.method.call(testObject2)");
         assertEquals(2, mTestController.waitForIntValue());
         executeJavaScript("testObject2.method.call(testObject1)");
         assertEquals(1, mTestController.waitForIntValue());
     }
 }