[Search] Store and recall search terms using NavigationEntry to improve search term extraction

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // Copyright 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/auto_reset.h"
 #include "base/format_macros.h"
@@ skipping 637 matching lines @@
     // all have IDs above the maximum, and will be automatically lumped
     // together in an "overflow" bucket in the histogram.
     UMA_HISTOGRAM_ENUMERATION("Omnibox.SearchEngine",
         template_url->prepopulate_id(),
         TemplateURLPrepopulateData::kMaxPrepopulatedEngineID);
   }
 
   if (disposition != NEW_BACKGROUND_TAB) {
     base::AutoReset<bool> tmp(&in_revert_, true);
     view_->RevertAll();  // Revert the box to its unedited state
+    if (controller()->GetInstant() &&
+        controller()->GetInstant()->IsInstantExtendedSearch()) {
+      // In the case of an instant-extended search, actually revert to
+      // |last_omnibox_text|, which is what the user is searching for. This
+      // avoids a flash of the previous query.
+      view_->OnTemporaryTextMaybeChanged(
+            controller()->GetInstant()->last_omnibox_text(),
+            true);
+    }
   }
 
   if (match.type == AutocompleteMatch::EXTENSION_APP) {
     ExtensionAppProvider::LaunchAppFromOmnibox(match, profile_, disposition);
   } else {
     GURL destination_url(match.destination_url);
     // Append the query formulation time (time from when the user first typed a
     // character into the omnibox to when the user selected a query) to the AQS
     // parameter if other AQS parameters were already populated.
     if (template_url && match.search_terms_args.get() &&
@@ skipping 671 matching lines @@
     instant->OmniboxFocusChanged(state, reason, NULL);
 
   // Update state and notify view if the omnibox has focus and the caret
   // visibility changed.
   const bool was_caret_visible = is_caret_visible();
   focus_state_ = state;
   if (focus_state_ != OMNIBOX_FOCUS_NONE &&
       is_caret_visible() != was_caret_visible)
     view_->ApplyCaretVisibility();
 }