Upstream the Android port find-in-page feature.

chrome/browser/ui/find_bar/find_tab_helper.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_FIND_BAR_FIND_TAB_HELPER_H_
 #define CHROME_BROWSER_UI_FIND_BAR_FIND_TAB_HELPER_H_
 
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "content/public/browser/web_contents_observer.h"
 
+namespace gfx {
+class RectF;
+}
+
 // Per-tab find manager. Handles dealing with the life cycle of find sessions.
 class FindTabHelper : public content::WebContentsObserver {
  public:
   explicit FindTabHelper(content::WebContents* web_contents);
   virtual ~FindTabHelper();
 
   // Starts the Find operation by calling StartFinding on the Tab. This function
   // can be called from the outside as a result of hot-keys, so it uses the
   // last remembered search string as specified with set_find_string(). This
   // function does not block while a search is in progress. The controller will
@@ skipping 28 matching lines @@
   string16 find_text() const { return find_text_; }
 
   // Accessor for the previous search we issued.
   string16 previous_find_text() const { return previous_find_text_; }
 
   // Accessor for find_result_.
   const FindNotificationDetails& find_result() const {
     return last_search_result_;
   }
 
+#if defined(OS_ANDROID)
+  // Selects and zooms to the find result nearest to the point (x,y)
+  // defined in find-in-page coordinates.
+  void ActivateNearestFindResult(float x, float y);
+
+  // Asks the renderer to send the rects of the current find matches.
+  void RequestFindMatchRects(int current_version);
+
+  void HandleGetFindMatchRectsReply(int version,

[jam, 2012/09/04 16:39:09]

it seems very unnecessary that chrome_web_contents_delegate_android.cc calls
this android-only method, which right before it registered for the notification
which it fires, and then it listens to the notifications it fires and calls code
as a result. i.e. this method should be removed, and
chrome_web_contents_delegate_android.cc should just do what it does in response
to the notification inline

[Leandro Graciá Gil, 2012/09/04 18:25:50]

This was done this way in order to get a symmetrical design and behaviour with
the find results and have FindTabHelper handle both the requests and replies for
all find-in-page operations. Also, it seems that the idea of tapping to find
results to go to them caught some attention while upstreaming the WebKit side.
Because of that I tried to make this simple to be adopted by Desktop in the
future in case we decide so. Furthermore, we might require this in the future if
at some point this reply needs to check the FindTabHelper status.

However, as you point we need no state check for this reply so it should be
possible to call directly from ChromeWebContentsDelegateAndroid for now.

I'll be removing this from here in the next iteration of the patch. If you
change your mind just tell me and I'll bring it in again.

+                                    const std::vector<gfx::RectF>& rects,
+                                    const gfx::RectF& active_rect);
+#endif
+
   void HandleFindReply(int request_id,
                        int number_of_matches,
                        const gfx::Rect& selection_rect,
                        int active_match_ordinal,
                        bool final_update);
 
  private:
   // Each time a search request comes in we assign it an id before passing it
   // over the IPC so that when the results come in we can evaluate whether we
   // still care about the results of the search (in some cases we don't because
@@ skipping 26 matching lines @@
 
   // The last find result. This object contains details about the number of
   // matches, the find selection rectangle, etc. The UI can access this
   // information to build its presentation.
   FindNotificationDetails last_search_result_;
 
   DISALLOW_COPY_AND_ASSIGN(FindTabHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_FIND_BAR_FIND_TAB_HELPER_H_