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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.app.Instrumentation;
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
-import android.view.ViewGroup;
 
 import junit.framework.Assert;
 
 import org.chromium.android_webview.AndroidWebViewUtil;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsClient;
 import org.chromium.content.browser.ContentSettings;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
@@ skipping 143 matching lines @@
         final Context context = getActivity();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 testContainerView.set(createAwTestContainerView(incognito, client));
             }
         });
         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
             public String call() throws Exception {
                 return contentViewCore.getTitle();
             }
         });
     }
 
     protected ContentSettings getContentSettingsOnUiThread(
@@ skipping 21 matching lines @@
             public void run() {
                 requestId.set(core.evaluateJavaScript(code));
             }
         });
         onEvaluateJavaScriptResultHelper.waitForCallback(currentCallCount);
         Assert.assertEquals("Response ID mismatch when evaluating JavaScript.",
                 requestId.get(), onEvaluateJavaScriptResultHelper.getId());
         return onEvaluateJavaScriptResultHelper.getJsonResult();
     }
 }