diff options
| author | timvolodine <timvolodine@chromium.org> | 2015-10-07 09:28:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-07 16:29:01 +0000 |
| commit | 14198f3d501debf8d19c6a0ce2493ee764a3f881 (patch) | |
| tree | cfd9e274c9b0a68226afb4dfccadf4699fd345eb /android_webview | |
| parent | fc4610f55cee65ac28c702e11619ae1d121f3b50 (diff) | |
| download | chromium_src-14198f3d501debf8d19c6a0ce2493ee764a3f881.zip chromium_src-14198f3d501debf8d19c6a0ce2493ee764a3f881.tar.gz chromium_src-14198f3d501debf8d19c6a0ce2493ee764a3f881.tar.bz2 | |
Fix testNoUnexpectedInterfaces in WebViewLayoutTest.
Add IdleDeadline interface to WebView expected interfaces.
This change is due to:
https://codereview.chromium.org/1366403003 (Ship requestIdleCallback)
API to be verfified in WebView (see crbug.com/540691)
BUG=540648,540691,506603
TBR=torne@chromium.org
Review URL: https://codereview.chromium.org/1391213002
Cr-Commit-Position: refs/heads/master@{#352857}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTest.java | 2 | ||||
| -rw-r--r-- | android_webview/tools/WebViewShell/test/webexposed/global-interface-listing-expected.txt | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTest.java b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTest.java index 9bba6b6..4d84446 100644 --- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTest.java +++ b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTest.java @@ -11,7 +11,6 @@ import android.test.suitebuilder.annotation.MediumTest; import junit.framework.ComparisonFailure; import org.chromium.base.Log; -import org.chromium.base.test.util.DisabledTest; import java.io.BufferedReader; import java.io.File; @@ -82,7 +81,6 @@ public class WebViewLayoutTest "webexposed/global-interface-listing-expected.txt", true); } - @DisabledTest // Failing on bot "Android Webview L (dbg)"; see crbug.com/540648 @MediumTest public void testNoUnexpectedInterfaces() throws Exception { ensureJsTestCopied(); diff --git a/android_webview/tools/WebViewShell/test/webexposed/global-interface-listing-expected.txt b/android_webview/tools/WebViewShell/test/webexposed/global-interface-listing-expected.txt index ca39b69..06a8c18 100644 --- a/android_webview/tools/WebViewShell/test/webexposed/global-interface-listing-expected.txt +++ b/android_webview/tools/WebViewShell/test/webexposed/global-interface-listing-expected.txt @@ -2677,6 +2677,10 @@ interface IDBVersionChangeEvent getter newVersion getter oldVersion method constructor +interface IdleDeadline + getter didTimeout + method constructor + method timeRemaining interface Image method constructor interface ImageBitmap @@ -5554,6 +5558,7 @@ interface Window method blur method btoa method cancelAnimationFrame + method cancelIdleCallback method captureEvents method clearInterval method clearTimeout @@ -5575,6 +5580,7 @@ interface Window method prompt method releaseEvents method requestAnimationFrame + method requestIdleCallback method resizeBy method resizeTo method scroll |