[Android] Upstream the WebView find-in-page API implementation.

android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index 3b246fc1de3101a0cfdf709e8f735cca2c0bb56c..85a64f75db7f8c872561e1319c26d9273fe34872 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -8,7 +8,6 @@ import android.app.Instrumentation;
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
-import android.view.ViewGroup;
 
 import junit.framework.Assert;
 
@@ -181,6 +180,16 @@ public class AndroidWebViewTestBase
         return testContainerView.get();
     }
 
+    protected void destroyAwContentsOnMainSync(final AwContents contents) {
+        if (contents == null) return;
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                contents.destroy();
+            }
+        });
+    }
+
     protected String getTitleOnUiThread(final ContentViewCore contentViewCore) throws Throwable {
         return runTestOnUiThreadAndGetResult(new Callable<String>() {
             @Override