Re-enable lots of AndroidWebView tests

A lot of tests started passing after r167797. Some just used to pass.

BUG=154674,148917,157563

Java test only change. AndroidWebView instrumentation tests passed twice.
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/11411015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168094 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 80 insertions, 238 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index 75dfb5c..4c2a5ae 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -1852,12 +1852,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
         }
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "Preferences"})
-     * Blocked on crbug/157563
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "Preferences"})
     public void testTextZoomNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1865,12 +1861,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
             new AwSettingsTextZoomTestHelper(views.getContents1(), views.getClient1()));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "Preferences"})
-     * Blocked on crbug/157563
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "Preferences"})
     public void testTextZoomIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1878,12 +1870,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
             new AwSettingsTextZoomTestHelper(views.getContents1(), views.getClient1()));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "Preferences"})
-     * Blocked on crbug/157563
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "Preferences"})
     public void testTextZoomBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
index 6def21e..928948d 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
@@ -43,10 +43,8 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
         assertEquals("data:text/html," + html, onPageFinishedHelper.getUrl());
     }
 
-    //@MediumTest
-    //@Feature({"AndroidWebView"})
-    // See crbug.com/148917
-    @FlakyTest
+    @MediumTest
+    @Feature({"AndroidWebView"})
     public void testOnPageFinishedCalledAfterError() throws Throwable {
         TestCallbackHelperContainer.OnReceivedErrorHelper onReceivedErrorHelper =
                 mContentsClient.getOnReceivedErrorHelper();
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
index d4f66aa..bd476f7 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
@@ -45,12 +45,8 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase {
         mContentViewCore = testContainerView.getContentViewCore();
     }
 
-    /**
-     * @SmallTest
-     * @Feature({"AndroidWebView"})
-     * crbug.com/147721
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView"})
     public void testFlingScroll() throws Throwable {
         StringBuffer testPage = new StringBuffer().append("data:text/html;utf-8,")
                 .append("<html><head><style>body { width: 5000px; height: 5000px; }</head><body>")
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
index d62fa63..c5389d6 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
@@ -118,12 +118,8 @@ public class GetTitleTest extends AndroidWebViewTestBase {
      * When url-file has the title info, the page title is set to it.
      * @throws Throwable
      */
-    /**
-     * @SmallTest
-     * @Feature({"AndroidWebView"})
-     * BUG 7228619
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView"})
     public void testLoadUrlGetTitle() throws Throwable {
         final PageInfo info = loadFromUrlAndGetTitle(getHtml(TITLE), GET_TITLE_TEST_PATH);
         assertEquals("Title should be " + TITLE, TITLE, info.mTitle);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
index 6ebab9f..42c4789 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
@@ -127,12 +127,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         });
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testSrcAnchorType() throws Throwable {
         String page = fullPageLink(HREF, ANCHOR_TEXT);
         setServerResponseAndLoad(page);
@@ -141,12 +137,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         assertTrue(pollForHrefAndImageSrcOnUiThread(HREF, ANCHOR_TEXT, null));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testSrcAnchorTypeRelativeUrl() throws Throwable {
         String relpath = "/foo.html";
         String fullpath = mWebServer.getResponseUrl(relpath);
@@ -158,12 +150,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         assertTrue(pollForHrefAndImageSrcOnUiThread(relpath, ANCHOR_TEXT, null));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testSrcEmailType() throws Throwable {
         String email = "foo@bar.com";
         String prefix = "mailto:";
@@ -174,12 +162,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         assertTrue(pollForHrefAndImageSrcOnUiThread(prefix+ email, ANCHOR_TEXT, null));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testSrcGeoType() throws Throwable {
         String location = "Jilin";
         String prefix = "geo:0,0?q=";
@@ -190,12 +174,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         assertTrue(pollForHrefAndImageSrcOnUiThread(prefix + location, ANCHOR_TEXT, null));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testSrcPhoneType() throws Throwable {
         String phone_num = "1234567890";
         String prefix = "tel:";
@@ -206,12 +186,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         assertTrue(pollForHrefAndImageSrcOnUiThread(prefix + phone_num, ANCHOR_TEXT, null));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testSrcImgeAnchorType() throws Throwable {
         String relImageSrc = "/nonexistent.jpg";
         String fullImageSrc = mWebServer.getResponseUrl(relImageSrc);
@@ -225,12 +201,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         assertTrue(pollForHrefAndImageSrcOnUiThread(HREF, null, fullImageSrc));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testImgeType() throws Throwable {
         String relImageSrc = "/nonexistent2.jpg";
         String fullImageSrc = mWebServer.getResponseUrl(relImageSrc);
@@ -243,12 +215,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         assertTrue(pollForHrefAndImageSrcOnUiThread(null, null, fullImageSrc));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testEditTextType() throws Throwable {
         String page = CommonResources.makeHtmlPageFrom("",
                 "<form><input class=\"full_view\" type=\"text\" name=\"test\"></form>");
@@ -259,12 +227,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         assertTrue(pollForHrefAndImageSrcOnUiThread(null, null, null));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testUnknownTypeJavascriptScheme() throws Throwable {
         // Per documentation, javascript urls are special.
         String javascript = "javascript:alert('foo');";
@@ -275,12 +239,8 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         assertTrue(pollForHitTestDataOnUiThread(HitTestResult.UNKNOWN_TYPE, null));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "WebKitHitTest"})
-     * BUG=158284
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "WebKitHitTest"})
     public void testUnknownTypeUnrecognizedNode() throws Throwable {
         // Since UNKNOWN_TYPE is the default, hit test another type first for
         // this test to be valid.
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
index 6058b37..656c821 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
@@ -14,33 +14,21 @@ import org.chromium.base.test.util.Feature;
  */
 public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllFinds() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllDouble() throws Throwable {
         findAllAsyncOnUiThread("wood");
         assertEquals(4, findAllAsyncOnUiThread("chuck"));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllDoubleNext() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
         assertEquals(4, findAllAsyncOnUiThread("wood"));
@@ -65,12 +53,8 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findAllAsyncOnUiThread(""));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindNextForward() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
 
@@ -80,12 +64,8 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findNextOnUiThread(true));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindNextBackward() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
 
@@ -95,12 +75,8 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(3, findNextOnUiThread(false));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindNextBig() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
 
@@ -113,12 +89,8 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findNextOnUiThread(true));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllEmptyNext() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
         assertEquals(1, findNextOnUiThread(true));
@@ -129,23 +101,15 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(1, findNextOnUiThread(true));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testClearMatches() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
         clearMatchesOnUiThread();
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testClearFindNext() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
         clearMatchesOnUiThread();
@@ -153,24 +117,16 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(2, findNextOnUiThread(true));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindEmptyNext() throws Throwable {
         assertEquals(0, findAllAsyncOnUiThread(""));
         assertEquals(0, findNextOnUiThread(true));
         assertEquals(4, findAllAsyncOnUiThread("wood"));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindNextFirst() throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
index 0f03bf5..14b1aac 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
@@ -16,12 +16,8 @@ import org.chromium.base.test.util.Feature;
  */
 public class WebViewMixedFindApisTest extends WebViewFindApisTestBase {
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testAsyncFindOperationsMixedWithSyncFind() throws Throwable {
         clearMatchesOnUiThread();
         assertEquals(4, findAllSyncOnUiThread("wood"));
@@ -33,12 +29,8 @@ public class WebViewMixedFindApisTest extends WebViewFindApisTestBase {
         assertEquals(4, findAllSyncOnUiThread("wood"));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testInterleavedFinds() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
         assertEquals(4, findAllAsyncOnUiThread("wood"));
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
index 597f1b0..1d91e7b 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
@@ -15,33 +15,21 @@ import org.chromium.base.test.util.Feature;
  */
 public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllFinds() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllDouble() throws Throwable {
         findAllSyncOnUiThread("wood");
         assertEquals(4, findAllSyncOnUiThread("chuck"));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllDoubleNext() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
         assertEquals(4, findAllSyncOnUiThread("wood"));
@@ -66,12 +54,8 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findAllSyncOnUiThread(""));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindNextForward() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
 
@@ -81,12 +65,8 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findNextOnUiThread(true));
     }
 
-    /**
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * http://crbug.com/154809
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindNextBackward() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
 
@@ -96,12 +76,8 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(3, findNextOnUiThread(false));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindNextBig() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
 
@@ -114,12 +90,8 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findNextOnUiThread(true));
     }
 
-    /**
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * http://crbug.com/154760
-     */
-    @FlakyTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllEmptyNext() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
         assertEquals(1, findNextOnUiThread(true));
@@ -130,23 +102,15 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(1, findNextOnUiThread(true));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testClearMatches() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
         clearMatchesOnUiThread();
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testClearFindNext() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
         clearMatchesOnUiThread();
@@ -154,24 +118,16 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(2, findNextOnUiThread(true));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindEmptyNext() throws Throwable {
         assertEquals(0, findAllSyncOnUiThread(""));
         assertEquals(0, findNextOnUiThread(true));
         assertEquals(4, findAllSyncOnUiThread("wood"));
     }
 
-    /*
-     * @SmallTest
-     * @Feature({"AndroidWebView", "FindInPage"})
-     * BUG=158284
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindNextFirst() throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override