Omnibox - Cleanup From Recent Changelists

components/omnibox/browser/search_provider.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 "components/omnibox/browser/search_provider.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <cmath>
 #include <utility>
@@ skipping 253 matching lines @@
   if (!minimal_changes ||
       !providers_.equal(default_provider_keyword, keyword_provider_keyword)) {
     // Cancel any in-flight suggest requests.
     if (!done_)
       Stop(false, false);
   }
 
   providers_.set(default_provider_keyword, keyword_provider_keyword);
 
   if (input.from_omnibox_focus()) {
-    // Don't display any suggestions for on-focus requests.  Stop any pending
-    // requests here (there likely aren't yet, though it doesn't hurt to be safe
-    // so that we can create a new request later in this flow (to warm-up the
-    // suggest server by alerting it that the user is likely about to start
-    // typing).
-    StopSuggest();
+    // Don't display any suggestions for on-focus requests.
+    DCHECK(done_);
     ClearAllResults();
   } else if (input.text().empty()) {
     // User typed "?" alone.  Give them a placeholder result indicating what
     // this syntax does.
     if (default_provider) {
       AutocompleteMatch match;
       match.provider = this;
       match.contents.assign(l10n_util::GetStringUTF16(IDS_EMPTY_KEYWORD_VALUE));
       match.contents_class.push_back(
           ACMatchClassification(0, ACMatchClassification::NONE));
@@ skipping 1229 matching lines @@
   for (MatchMap::const_iterator i(map.begin()); i != map.end(); ++i)
     matches.push_back(i->second);
   std::sort(matches.begin(), matches.end(), &AutocompleteMatch::MoreRelevant);
 
   // If there is a top scoring entry, find the corresponding answer.
   if (!matches.empty())
     return answers_cache_.GetTopAnswerEntry(matches[0].contents);
 
   return AnswersQueryData();
 }