summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-25 20:39:32 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-25 20:39:32 +0000
commit8cf18437002bf8d7396f95515eba91d262452751 (patch)
tree40a6f87d8515196d027aa931661742a24be830ac
parentcc7ec7f103f86cc054f9e92e27d66db1c9c1a19b (diff)
downloadchromium_src-8cf18437002bf8d7396f95515eba91d262452751.zip
chromium_src-8cf18437002bf8d7396f95515eba91d262452751.tar.gz
chromium_src-8cf18437002bf8d7396f95515eba91d262452751.tar.bz2
aw: Renable testCalledForIframe
Root cause of flakiness was fixed in r247036. BUG=337557 TBR=mkosiba NOTRY=true Review URL: https://codereview.chromium.org/140953004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247140 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
index 97b85d4..4edf755 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
@@ -10,7 +10,6 @@ import android.util.Pair;
import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.InterceptedRequestData;
import org.chromium.android_webview.test.util.CommonResources;
-import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.TestFileUtil;
import org.chromium.content.browser.test.util.CallbackHelper;
@@ -449,12 +448,8 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase {
assertEquals(onReceivedErrorHelperCallCount, onReceivedErrorHelper.getCallCount());
}
- /*
@SmallTest
@Feature({"AndroidWebView"})
- crbug.com/337557
- */
- @DisabledTest
public void testCalledForIframe() throws Throwable {
final String aboutPageUrl = addAboutPageToTestServer(mWebServer);
final String pageWithIframe = addPageToTestServer(mWebServer, "/page_with_iframe.html",