summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authoracleung@chromium.org <acleung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 22:38:11 +0000
committeracleung@chromium.org <acleung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 22:38:11 +0000
commit594b325e13c8a6ac9b65e0a9a981973c2d0b3a14 (patch)
tree6c50debc7119941996ced6b1a3676e121a68da3b /android_webview
parent06a07d94f8b33645f18b3bc3d67be6d8aeb158fa (diff)
downloadchromium_src-594b325e13c8a6ac9b65e0a9a981973c2d0b3a14.zip
chromium_src-594b325e13c8a6ac9b65e0a9a981973c2d0b3a14.tar.gz
chromium_src-594b325e13c8a6ac9b65e0a9a981973c2d0b3a14.tar.bz2
Enable AwContentsTest#testGetFavicon()
BUG= TBR=mkosiba@chromium.org Review URL: https://chromiumcodereview.appspot.com/12069002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index 6d0ee4d..4f64c4c 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -210,12 +210,8 @@ public class AwContentsTest extends AndroidWebViewTestBase {
private static final long TEST_TIMEOUT = 20000L;
private static final int CHECK_INTERVAL = 100;
- /**
- * @SmallTest
- * @Feature({"AndroidWebView"})
- * BUG 6094807
- */
- @DisabledTest
+ @SmallTest
+ @Feature({"AndroidWebView"})
public void testGetFavicon() throws Throwable {
final AwTestContainerView testView = createAwTestContainerViewOnMainSync(mContentsClient);
final AwContents awContents = testView.getAwContents();