Upstream rewrite of Instant.

chrome/browser/ui/omnibox/omnibox_edit_model.h

Index: chrome/browser/ui/omnibox/omnibox_edit_model.h
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
index f990b3e84917ae31b5aac454424cb659dc0b6290..b2fd2a6cc05b90c5a80efea27f147030a98d3f02 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -215,7 +215,7 @@ class OmniboxEditModel : public AutocompleteControllerDelegate {
   void OnSetFocus(bool control_down);
 
   // Sent before |OnKillFocus| and before the popup is closed.
-  void OnWillKillFocus(gfx::NativeView view_gaining_focus);
+  void OnWillKillFocus();
 
   // Called when the view is losing focus.  Resets some state.
   void OnKillFocus();
@@ -373,9 +373,13 @@ class OmniboxEditModel : public AutocompleteControllerDelegate {
   // Notifies the SearchTabHelper that autocomplete state has changed.
   void NotifySearchTabHelper();
 
-  // Tries to start an instant preview for |match|. Returns true if instant
-  // processed the match.
-  bool DoInstant(const AutocompleteMatch& match, string16* suggested_text);
+  // Tries to start an Instant preview for |match|. Returns true if Instant
+  // processed the match. |suggested_text| should initially contain the current
+  // inline autocomplete text. Instant will replace it to new suggested text
+  // and set |complete_behavior| accordingly.
+  bool DoInstant(const AutocompleteMatch& match,
+                 string16* suggested_text,
+                 InstantCompleteBehavior* complete_behavior);
 
   // Starts a prerender for the given |match|.
   void DoPrerender(const AutocompleteMatch& match);
@@ -508,7 +512,8 @@ class OmniboxEditModel : public AutocompleteControllerDelegate {
   // This has no effect if we're already in keyword mode.
   bool allow_exact_keyword_match_;
 
-  // Last value of InstantCompleteBehavior supplied to |SetSuggestedText|.
+  // Last value of InstantCompleteBehavior supplied to SetSuggestedText(),
+  // tracked for unit testing.
   InstantCompleteBehavior instant_complete_behavior_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel);