Fix handling of inline autocomplete text vis-a-vis 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 631 matching lines @@
   is_keyword_hint_ = false;
 
   if (popup_->IsOpen())
     popup_->SetSelectedLineState(OmniboxPopupModel::KEYWORD);
   else
     StartAutocomplete(false, true);
 
   // Ensure the current selection is saved before showing keyword mode
   // so that moving to another line and then reverting the text will restore
   // the current state properly.
+  bool save_original_selection = !has_temporary_text_;
+  has_temporary_text_ = true;
   view_->OnTemporaryTextMaybeChanged(
       DisplayTextFromUserText(CurrentMatch().fill_into_edit),
-      !has_temporary_text_);
-  has_temporary_text_ = true;
+      save_original_selection);
 
   content::RecordAction(UserMetricsAction("AcceptedKeywordHint"));
   return true;
 }
 
 void OmniboxEditModel::ClearKeyword(const string16& visible_text) {
   autocomplete_controller_->Stop(false);
   ClearPopupKeywordMode();
 
   const string16 window_text(keyword_ + visible_text);
@@ skipping 447 matching lines @@
 
   if (in_revert_)
     return false;
 
   InstantController* instant = controller_->GetInstant();
 
   if (!instant)
     return false;
 
   if (user_input_in_progress_ && popup_->IsOpen()) {
-    string16 text = view_->GetText();
-    AutocompleteInput::RemoveForcedQueryStringIfNecessary(
-        autocomplete_controller_->input().type(), &text);
+    // The two pieces of text we want to send Instant, viz., what the user has
+    // typed, and any inline autocomplete suggestion.
+    string16 user_text = user_text_;
+    *suggested_text = inline_autocomplete_text_;
 
-    // If there's any inline autocompletion, split it out from |text|.
-    if (!inline_autocomplete_text_.empty()) {
-      DCHECK_GE(text.size(), inline_autocomplete_text_.size());
-      text.resize(text.size() - inline_autocomplete_text_.size());
-      *suggested_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_) {
+      user_text = CurrentMatch().fill_into_edit;
+      suggested_text->clear();
     }
 
-    return instant->Update(match, text, UseVerbatimInstant(), suggested_text,
-                           complete_behavior);
+    // Remove any keywords and "?" prefix.
+    user_text = DisplayTextFromUserText(user_text);
+    AutocompleteInput::RemoveForcedQueryStringIfNecessary(
+        autocomplete_controller_->input().type(), &user_text);
+
+    return instant->Update(match, user_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();
   return false;
 }
@@ skipping 59 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);
 }