Pass user_text and full_text explicitly to Instant.

chrome/browser/instant/instant_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 58 matching lines @@
   InstantController(InstantControllerDelegate* delegate, Mode mode);
   virtual ~InstantController();
 
   // Registers Instant related preferences.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns true if Instant is enabled for the given |profile|.
   static bool IsEnabled(Profile* profile);
 
   // Invoked as the user types into the omnibox. |user_text| is what the user
-  // has typed. |suggested_text| is the current inline autocomplete text. It
-  // may be replaced by Instant's autocomplete suggestion, if any. If |verbatim|
-  // is true, search results are shown for |user_text| rather than the best
-  // guess as to what Instant thinks the user means. Returns true if the update
-  // is processed by Instant (i.e., if |match| is a search rather than a URL).
+  // has typed. |full_text| is what the omnibox is showing. These may differ if
+  // the user typed only some text, and the rest was inline autocompleted. If
+  // |verbatim| is true, search results are shown for the exact omnibox text,
+  // rather than the best guess as to what the user means. Returns true if the
+  // update is accepted (i.e., if |match| is a search rather than a URL).
   bool Update(const AutocompleteMatch& match,
               const string16& user_text,
-              bool verbatim,
-              string16* suggested_text,
-              InstantCompleteBehavior* complete_behavior);
+              const string16& full_text,
+              bool verbatim);
 
   // Sets the bounds of the omnibox dropdown, in screen coordinates.
   void SetOmniboxBounds(const gfx::Rect& bounds);
 
   // Send autocomplete results from |providers| to the preview page.
   void HandleAutocompleteResults(
       const std::vector<AutocompleteProvider*>& providers);
 
   // The preview TabContents. May be NULL if ReleasePreviewContents() has been
   // called, with no subsequent successful call to Update(). InstantController
@@ skipping 85 matching lines @@
 
   // See the enum description above.
   const Mode mode_;
 
   // The active tab at the time of the last Update(). Used by IsOutOfDate() to
   // know whether the user switched tabs. ***NEVER DEREFERENCE THIS POINTER.***
   // It may be a dangling pointer to a freed object. Should only be used for
   // pointer comparisons.
   const void* last_active_tab_;
 
-  // The most recent full omnibox query text known to us. If this is empty, it
-  // could also mean that the omnibox text was a URL (or something else that
-  // we shouldn't be processing).
+  // The most recent full_text passed to Update().
   string16 last_full_text_;
 
   // The most recent user_text passed to Update().
   string16 last_user_text_;
 
   // The most recent verbatim passed to Update().
   bool last_verbatim_;
 
   // The most recent suggestion received from the page, minus any prefix that
   // the user has typed.
@@ skipping 29 matching lines @@
   // Search terms extraction (for autocomplete history matches) doesn't work
   // on Instant URLs. So, whenever the user commits an Instant search, we add
   // an equivalent non-Instant search URL to history, so that the search shows
   // up in autocomplete history matches.
   GURL url_for_history_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_