[Instant] Update InstantController state to ensure valid subsequent queries

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 541 matching lines @@
     content::NavigationEntry* entry =
         preview->GetController().GetVisibleEntry();
     std::string url = entry->GetVirtualURL().spec();
     if (!google_util::IsInstantExtendedAPIGoogleSearchUrl(url) &&
         google_util::IsGoogleDomainUrl(url, google_util::ALLOW_SUBDOMAIN,
                                        google_util::ALLOW_NON_STANDARD_PORTS)) {
       // Hitting ENTER searches for what the user typed, so use
       // last_omnibox_text_. Clicking on the overlay commits what is currently
       // showing, so add in the gray text in that case.
       std::string query(UTF16ToUTF8(last_omnibox_text_));
-      if (type != INSTANT_COMMIT_PRESSED_ENTER)
+      if (type != INSTANT_COMMIT_PRESSED_ENTER) {
         query += UTF16ToUTF8(last_suggestion_.text);
+        // Update |last_omnibox_text_| so that the controller commits the proper
+        // query if the user focuses the omnibox and presses Enter.
+        last_omnibox_text_ += last_suggestion_.text;
+      }
       entry->SetVirtualURL(GURL(
           url + "#q=" +
           net::EscapeQueryParamValue(query, true)));
       chrome::search::SearchTabHelper::FromWebContents(preview)->
           NavigationEntryUpdated();
     }
   }
 
   // If the preview page has navigated since the last Update(), we need to add
   // the navigation to history ourselves. Else, the page will navigate after
@@ skipping 179 matching lines @@
              !allow_preview_to_show_search_suggestions_) {
     return;
   }
 
   InstantSuggestion suggestion;
   if (!suggestions.empty())
     suggestion = suggestions[0];
 
   if (instant_tab_ && search_mode_.is_search_results() &&
       suggestion.behavior == INSTANT_COMPLETE_REPLACE) {
+    // Update |last_omnibox_text_| so that the controller commits the proper
+    // query if the user focuses the omnibox and presses Enter.
+    last_omnibox_text_ = suggestion.text;
+    last_suggestion_ = InstantSuggestion();
+    last_match_was_search_ = suggestion.type == INSTANT_SUGGESTION_SEARCH;
     // This means a committed page in state search called setValue(). We should
     // update the omnibox to reflect what the search page says.
     browser_->SetInstantSuggestion(suggestion);
-    // Don't update last_omnibox_text_ or last_suggestion_ since the user is not
-    // currently editing text in the omnibox.
     return;
   }
 
   // Ignore if we are not currently accepting search suggestions.
   if (!search_mode_.is_search_suggestions() || last_omnibox_text_.empty())
     return;
 
   if (suggestion.behavior == INSTANT_COMPLETE_REPLACE) {
     // We don't get an Update() when changing the omnibox due to a REPLACE
     // suggestion (so that we don't inadvertently cause the preview to change
@@ skipping 479 matching lines @@
       iter->second > kMaxInstantSupportFailures) {
     RecordEventHistogram(INSTANT_CONTROLLER_EVENT_URL_BLOCKED_BY_BLACKLIST);
     LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
         "GetInstantURL: Instant URL blacklisted: url=%s",
         instant_url->c_str()));
     return false;
   }
 
   return true;
 }