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

android_webview/java/src/org/chromium/android_webview/AwContents.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;
 
 import android.view.ViewGroup;
 import android.os.Message;
 
 import org.chromium.base.CalledByNative;
@@ skipping 44 matching lines @@
      */
     public AwContents(ViewGroup containerView,
         ContentViewCore.InternalAccessDelegate internalAccessAdapter,
         ContentViewCore contentViewCore, AwContentsClient contentsClient,
         boolean privateBrowsing, boolean isAccessFromFileURLsGrantedByDefault) {
       mNativeAwContents = nativeInit(contentsClient.getWebContentsDelegate(), privateBrowsing);
       mContentViewCore = contentViewCore;
       mContentsClient = contentsClient;
       mCleanupReference = new CleanupReference(this, new DestroyRunnable(mNativeAwContents));
 
-      // TODO: upstream the needed ContentViewCore initialization method.
-      // mContentViewCore.initialize(containerView, internalAccessAdapter, false,
-      //     nativeGetWebContents(mNativeAwContents), isAccessFromFileURLsGrantedByDefault);
+      mContentViewCore.initialize(containerView, internalAccessAdapter, false,
+          nativeGetWebContents(mNativeAwContents), isAccessFromFileURLsGrantedByDefault);
       mContentViewCore.setContentViewClient(contentsClient);
     }
 
     public ContentViewCore getContentViewCore() {
         return mContentViewCore;
     }
 
     public void destroy() {
         if (mContentViewCore != null) {
             mContentViewCore.destroy();
             mContentViewCore = null;
         }
         mCleanupReference.cleanupNow();
     }
 
+    public int findAllSync(String searchString) {
+        return nativeFindAllSync(mNativeAwContents, searchString);
+    }
+
+    public void findAllAsync(String searchString) {
+        nativeFindAllAsync(mNativeAwContents, searchString);
+    }
+
+    public void findNext(boolean forward) {
+        nativeFindNext(mNativeAwContents, forward);
+    }
+
+    public void clearMatches() {
+        nativeClearMatches(mNativeAwContents);
+    }
+
     /**
-     * @return load progress of the WebContents
+     * @return load progress of the WebContents.
      */
     public int getMostRecentProgress() {
         // WebContentsDelegateAndroid conveniently caches the most recent notified value for us.
         return mContentsClient.getWebContentsDelegate().getMostRecentProgress();
     }
 
     //--------------------------------------------------------------------------------------------
     //  WebView[Provider] method implementations (where not provided by ContentViewCore)
     //--------------------------------------------------------------------------------------------
 
     public void documentHasImages(Message message) {
       nativeDocumentHasImages(mNativeAwContents, message);
     }
 
     //--------------------------------------------------------------------------------------------
     //  Methods called from native via JNI
     //--------------------------------------------------------------------------------------------
 
     @CalledByNative
     private static void onDocumentHasImagesResponse(boolean result, Message message) {
         message.arg1 = result ? 1 : 0;
         message.sendToTarget();
     }
 
     @CalledByNative
     private void onReceivedHttpAuthRequest(AwHttpAuthHandler handler, String host, String realm) {
         mContentsClient.onReceivedHttpAuthRequest(handler, host, realm);
     }
 
+    @CalledByNative
+    public void onFindResultReceived(int activeMatchOrdinal, int numberOfMatches,
+            boolean isDoneCounting) {
+        mContentsClient.onFindResultReceived(activeMatchOrdinal, numberOfMatches, isDoneCounting);
+    }
+
     //--------------------------------------------------------------------------------------------
     //  Native methods
     //--------------------------------------------------------------------------------------------
 
     private native int nativeInit(AwWebContentsDelegate webViewWebContentsDelegate,
             boolean privateBrowsing);
     private static native void nativeDestroy(int nativeAwContents);
 
     private native int nativeGetWebContents(int nativeAwContents);
 
     private native void nativeDocumentHasImages(int nativeAwContents, Message message);
+
+    private native int nativeFindAllSync(int nativeAwContents, String searchString);
+    private native void nativeFindAllAsync(int nativeAwContents, String searchString);
+    private native void nativeFindNext(int nativeAwContents, boolean forward);
+    private native void nativeClearMatches(int nativeAwContents);
 }