| 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 59054668815ae54e5dd08616827d56212033caa0..0f8253ba9a1074da6dafcf74b81d7839aafa57c4 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
|
| @@ -6,13 +6,13 @@ package org.chromium.content.browser;
|
|
|
| import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
|
|
|
| +import android.test.FlakyTest;
|
| 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.DisabledTest;
|
| import org.chromium.base.test.util.Feature;
|
| import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
|
| import org.chromium.content_public.browser.LoadUrlParams;
|
| @@ -180,9 +180,12 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
|
| assertEquals("object", executeJavaScriptAndGetStringResult("typeof testObject"));
|
| }
|
|
|
| - @SmallTest
|
| - @Feature({"AndroidWebView", "Android-JavaBridge"})
|
| - @DisabledTest //crbug/468679
|
| + /**
|
| + * @SmallTest
|
| + * @Feature({"AndroidWebView", "Android-JavaBridge"})
|
| + * http://crbug.com/468679
|
| + */
|
| + @FlakyTest
|
| public void testRemovalNotReflectedUntilReload() throws Throwable {
|
| injectObjectAndReload(new Object() {
|
| public void method() {
|
|
|