Fix search terms handling on commit

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 634 matching lines @@
 
   if (loader_)
     loader_->SendThemeAreaHeight(height);
 }
 
 void InstantController::SetSuggestions(
     const content::WebContents* contents,
     const std::vector<InstantSuggestion>& suggestions) {
   DVLOG(1) << "SetSuggestions";
 
-  // Ignore if we are not currently accepting search suggestions.
-  if (!search_mode_.is_search_suggestions() || last_omnibox_text_.empty())
-    return;
-
   // Ignore if the message is from an unexpected source.
   if (instant_tab_) {
     if (instant_tab_->contents() != contents)
       return;
   } else if (!loader_ || loader_->contents() != contents ||
              !allow_preview_to_show_search_suggestions_) {
     return;
   }
 
   InstantSuggestion suggestion;
   if (!suggestions.empty())
     suggestion = suggestions[0];
 
+  if (instant_tab_ && instant_tab_->contents() == contents &&

[beaudoin, 2012/12/14 15:36:20]

Nit: the "instant_tab_->contents() == contents" part is guaranteed by the if at
line 657. Maybe turn it into a dcheck if you want to be sure?

[samarth, 2012/12/14 17:48:59]

Done.

+      search_mode_.is_search_results()) {
+    // Treat any calls to SetSuggestions in committed search mode as a REPLACE.

[beaudoin, 2012/12/14 15:36:20]

Not sure that the comment here describes the next line? Are you trying to
describe what GWS does with these suggestions? If so, please clarify the
comment.

[samarth, 2012/12/14 17:48:59]

Done.

+    browser_->SetInstantSuggestion(suggestion);
+    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
     // what it's showing, as the user arrows up/down through the page-provided
     // suggestions). So, update these state variables here.
     last_omnibox_text_ = suggestion.text;
     last_suggestion_ = InstantSuggestion();
     last_match_was_search_ = suggestion.type == INSTANT_SUGGESTION_SEARCH;
     DVLOG(1) << "SetReplaceSuggestion: text='" << suggestion.text << "'"
              << " type=" << suggestion.type;
@@ skipping 406 matching lines @@
   }
 
   std::map<std::string, int>::const_iterator iter =
       blacklisted_urls_.find(*instant_url);
   if (iter != blacklisted_urls_.end() &&
       iter->second > kMaxInstantSupportFailures)
     return false;
 
   return true;
 }