Re-enable Android WebView FindApi tests

The crash was due to AwContents.destroy being called explicitly in
tearDown. AwContents.destroy is not required to be called and the
code path is not well tested and crashing currently.

In this patch, do not call destroy and re-enable all FindApi tests
to regain test coverage. There are separate (disabled) tests and
bugs tracking making destroy code path work.

BUG=172184,173128
TBR=mkosiba@chromium.org
Android only change. Ran through android trybots.
NOTRY=true

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

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

4 files changed, 0 insertions, 130 deletions

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 477136f..9442b50 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
@@ -6,7 +6,6 @@ package org.chromium.android_webview.test;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 
 /**
@@ -14,75 +13,47 @@ import org.chromium.base.test.util.Feature;
  */
 public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllFinds() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllDouble() throws Throwable {
         findAllAsyncOnUiThread("wood");
         assertEquals(4, findAllAsyncOnUiThread("chuck"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllDoubleNext() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
         assertEquals(4, findAllAsyncOnUiThread("wood"));
         assertEquals(2, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllDoesNotFind() throws Throwable {
         assertEquals(0, findAllAsyncOnUiThread("foo"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllEmptyPage() throws Throwable {
         assertEquals(0, findAllAsyncOnUiThread("foo"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllEmptyString() throws Throwable {
         assertEquals(0, findAllAsyncOnUiThread(""));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindNextForward() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
 
@@ -92,12 +63,8 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindNextBackward() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
 
@@ -107,12 +74,8 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(3, findNextOnUiThread(false));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindNextBig() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
 
@@ -125,12 +88,8 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllEmptyNext() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
         assertEquals(1, findNextOnUiThread(true));
@@ -141,23 +100,15 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(1, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testClearMatches() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
         clearMatchesOnUiThread();
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testClearFindNext() throws Throwable {
         assertEquals(4, findAllAsyncOnUiThread("wood"));
         clearMatchesOnUiThread();
@@ -165,24 +116,16 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(2, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindEmptyNext() throws Throwable {
         assertEquals(0, findAllAsyncOnUiThread(""));
         assertEquals(0, findNextOnUiThread(true));
         assertEquals(4, findAllAsyncOnUiThread("wood"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindNextFirst() throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
index dc235179..21aad00 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
@@ -32,12 +32,6 @@ public class WebViewFindApisTestBase extends AndroidWebViewTestBase {
         }
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        destroyAwContentsOnMainSync(mContents);
-        super.tearDown();
-    }
-
     protected AwContents contents() {
         return mContents;
     }
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 cf1945b..b5a7313 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
@@ -4,10 +4,8 @@
 
 package org.chromium.android_webview.test;
 
-import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 
 /**
@@ -17,12 +15,8 @@ import org.chromium.base.test.util.Feature;
  */
 public class WebViewMixedFindApisTest extends WebViewFindApisTestBase {
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    crbug.com/158112
-    */
-    @FlakyTest
     public void testAsyncFindOperationsMixedWithSyncFind() throws Throwable {
         clearMatchesOnUiThread();
         assertEquals(4, findAllSyncOnUiThread("wood"));
@@ -34,12 +28,8 @@ public class WebViewMixedFindApisTest extends WebViewFindApisTestBase {
         assertEquals(4, findAllSyncOnUiThread("wood"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     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 e17d1e9..d4c4859 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
@@ -7,7 +7,6 @@ package org.chromium.android_webview.test;
 import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 
 /**
@@ -15,75 +14,47 @@ import org.chromium.base.test.util.Feature;
  */
 public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllFinds() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    crbug.com/158112
-    */
-    @FlakyTest
     public void testFindAllDouble() throws Throwable {
         findAllSyncOnUiThread("wood");
         assertEquals(4, findAllSyncOnUiThread("chuck"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    crbug.com/158112
-    */
-    @FlakyTest
     public void testFindAllDoubleNext() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
         assertEquals(4, findAllSyncOnUiThread("wood"));
         assertEquals(2, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllDoesNotFind() throws Throwable {
         assertEquals(0, findAllSyncOnUiThread("foo"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllEmptyPage() throws Throwable {
         assertEquals(0, findAllSyncOnUiThread("foo"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllEmptyString() throws Throwable {
         assertEquals(0, findAllSyncOnUiThread(""));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindNextForward() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
 
@@ -93,12 +64,8 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindNextBackward() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
 
@@ -108,12 +75,8 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(3, findNextOnUiThread(false));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindNextBig() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
 
@@ -126,12 +89,8 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(0, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindAllEmptyNext() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
         assertEquals(1, findNextOnUiThread(true));
@@ -142,23 +101,15 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(1, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testClearMatches() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
         clearMatchesOnUiThread();
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    crbug.com/158112
-    */
-    @FlakyTest
     public void testClearFindNext() throws Throwable {
         assertEquals(4, findAllSyncOnUiThread("wood"));
         clearMatchesOnUiThread();
@@ -166,24 +117,16 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
         assertEquals(2, findNextOnUiThread(true));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindEmptyNext() throws Throwable {
         assertEquals(0, findAllSyncOnUiThread(""));
         assertEquals(0, findNextOnUiThread(true));
         assertEquals(4, findAllSyncOnUiThread("wood"));
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "FindInPage"})
-    http://crbug.com/173128
-    */
-    @DisabledTest
     public void testFindNextFirst() throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override