[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/utf_string_conversions.h"
@@ skipping 531 matching lines @@
       // 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)
         query += UTF16ToUTF8(last_suggestion_.text);
       entry->SetVirtualURL(GURL(
           url + "#q=" +
           net::EscapeQueryParamValue(query, true)));
       chrome::search::SearchTabHelper::FromWebContents(preview)->
           NavigationEntryUpdated();
+      // Update |last_omnibox_text_| so that the controller commits the proper
+      // query if the user focuses the omnibox and presses Enter.
+      last_omnibox_text_ = ASCIIToUTF16(query);

[sreeram, 2013/01/24 22:54:32]

You only need to do this if we hit the "if" condition on line 545. Otherwise,
you're merely converting from last_omnibox_text_ -> query -> last_omnibox_text_.
So just put this along with line 546.

[Mathieu, 2013/01/28 18:50:32]

Done.

     }
   }
 
   // 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
   // commit, and it will be added to history in the usual manner.
   const history::HistoryAddPageArgs& last_navigation =
       loader_->last_navigation();
   if (!last_navigation.url.is_empty()) {
     content::NavigationEntry* entry = preview->GetController().GetActiveEntry();
@@ skipping 174 matching lines @@
 
   InstantSuggestion suggestion;
   if (!suggestions.empty())
     suggestion = suggestions[0];
 
   if (instant_tab_ && search_mode_.is_search_results() &&
       suggestion.behavior == INSTANT_COMPLETE_REPLACE) {
     // 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.
+    // 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;

[sreeram, 2013/01/24 22:54:32]

Put this above the call to browser_->SetInstantSuggestion(). Also reset
last_suggestion_ and set last_match_was_search_. Basically, the same code as in
lines 764 to 769 below.

[Mathieu, 2013/01/28 18:50:32]

Okay, copied the lines over there.

     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 472 matching lines @@
   std::map<std::string, int>::const_iterator iter =
       blacklisted_urls_.find(*instant_url);
   if (iter != blacklisted_urls_.end() &&
       iter->second > kMaxInstantSupportFailures) {
     RecordEventHistogram(INSTANT_CONTROLLER_EVENT_URL_BLOCKED_BY_BLACKLIST);
     return false;
   }
 
   return true;
 }