Pass user_text and full_text explicitly to Instant.

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // 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.
 
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 1108 matching lines @@
   if (in_revert_)
     return false;
 
   InstantController* instant = controller_->GetInstant();
 
   if (!instant)
     return false;
 
   if (user_input_in_progress_ && popup_->IsOpen()) {
     // The two pieces of text we want to send Instant, viz., what the user has
-    // typed, and any inline autocomplete suggestion.
+    // typed, and the full omnibox text including any inline autocompletion.
     string16 user_text = user_text_;
-    *suggested_text = inline_autocomplete_text_;
+    string16 full_text = user_text_ + inline_autocomplete_text_;
 
     // If there's temporary text, that overrides the user_text. In this case, we
     // should ignore any inline_autocomplete_text_, because it won't be visible.
     if (has_temporary_text_) {

[Peter Kasting, 2012/08/24 22:27:19]

Nit: Remove {}

[sreeram, 2012/08/24 23:09:55]

Done.

-      user_text = CurrentMatch().fill_into_edit;
-      suggested_text->clear();
+      user_text = full_text = CurrentMatch().fill_into_edit;
     }
 
-    // Remove any keywords and "?" prefix.
+    // Remove keyword if we're in keyword mode.
     user_text = DisplayTextFromUserText(user_text);
+    full_text = DisplayTextFromUserText(full_text);
+
+    // Remove "?" if we're in forced query mode.
     AutocompleteInput::RemoveForcedQueryStringIfNecessary(
         autocomplete_controller_->input().type(), &user_text);
+    AutocompleteInput::RemoveForcedQueryStringIfNecessary(
+        autocomplete_controller_->input().type(), &full_text);
 
-    return instant->Update(match, user_text, UseVerbatimInstant(),
+    return instant->Update(match, user_text, full_text, UseVerbatimInstant(),
                            suggested_text, complete_behavior);
   }
 
   // It's possible DoInstant() was called due to an OnChanged() event from the
   // omnibox view if the user clicked the renderer while IME composition was
   // active. In that case we still want to commit on mouse up, so don't call
   // Hide().
   if (!instant->commit_on_pointer_release())
     instant->Hide();
+

[Peter Kasting, 2012/08/24 22:27:19]

NIt: Don't really need this new line

[sreeram, 2012/08/24 23:09:55]

Done.

   return false;
 }
 
 void OmniboxEditModel::DoPrerender(const AutocompleteMatch& match) {
   // Do not prerender if the destination URL is the same as the current URL.
   if (match.destination_url == PermanentURL())
     return;
   // It's possible the tab strip does not have an active tab contents, for
   // instance if the tab has been closed or on return from a sleep state
   // (http://crbug.com/105689)
@@ skipping 51 matching lines @@
 }
 
 void OmniboxEditModel::ClassifyStringForPasteAndGo(
     const string16& text,
     AutocompleteMatch* match,
     GURL* alternate_nav_url) const {
   DCHECK(match);
   AutocompleteClassifierFactory::GetForProfile(profile_)->Classify(text,
       string16(), false, false, match, alternate_nav_url);
 }