Revert of Reverting due to Android builders breakage. Subsequent fixes did not fix.

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 ddc655b8430b3fb0e609ad97f536731c685f2898..950e772a112c7278a1a91fa0e5a28e0b91072e95 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
@@ -10,6 +10,7 @@
 
 import junit.framework.Assert;
 
+import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content_public.browser.LoadUrlParams;
@@ -36,6 +37,7 @@
  * - Inheritance
  */
 public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
+    @SuppressFBWarnings("CHROMIUM_SYNCHRONIZED_METHOD")
     private class TestController extends Controller {
         private int mIntValue;
         private long mLongValue;
@@ -143,14 +145,23 @@
     }
 
     // Note that this requires that we can pass a JavaScript boolean to Java.
-    private void assertRaisesException(String script) throws Throwable {
+    private void executeAndSetIfException(String script) throws Throwable {
         executeJavaScript("try {"
                 + script + ";"
                 + "  testController.setBooleanValue(false);"
                 + "} catch (exception) {"
                 + "  testController.setBooleanValue(true);"
                 + "}");
+    }
+
+    private void assertRaisesException(String script) throws Throwable {
+        executeAndSetIfException(script);
         assertTrue(mTestController.waitForBooleanValue());
+    }
+
+    private void assertNoRaisedException(String script) throws Throwable {
+        executeAndSetIfException(script);
+        assertFalse(mTestController.waitForBooleanValue());
     }
 
     @SmallTest
@@ -631,7 +642,9 @@
         injectObjectAndReload(new Object() {
             public void method() {}
             private void privateMethod() {}
+            @SuppressFBWarnings("UUF_UNUSED")
             public int field;
+            @SuppressFBWarnings("UUF_UNUSED")
             private int mPrivateField;
         }, "testObject");
         executeJavaScript(
@@ -699,13 +712,16 @@
                 return getClass();
             }
 
+            @SuppressFBWarnings("UUF_UNUSED")
             private int mField;
         }, "testObject");
-        assertRaisesException("testObject.myGetClass().getField('field')");
+        String fieldName = "mField";
+        assertRaisesException("testObject.myGetClass().getField('" + fieldName + "')");
         // getDeclaredField() is able to access a private field, but getInt()
         // throws a Java exception.
+        assertNoRaisedException("testObject.myGetClass().getDeclaredField('" + fieldName + "')");
         assertRaisesException(
-                "testObject.myGetClass().getDeclaredField('field').getInt(testObject)");
+                "testObject.myGetClass().getDeclaredField('" + fieldName + "').getInt(testObject)");
     }
 
     @SmallTest