Fix Omnibox search provider's confusing internal variable semantics

chrome/browser/autocomplete/search_provider.cc

 // Copyright (c) 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/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/callback.h"
@@ skipping 486 matching lines @@
   // We can't keep running any previous query, so halt it.
   StopSuggest();
 
   // Remove existing results that cannot inline autocomplete the new input.
   RemoveStaleResults();
 
   // We can't start a new query if we're only allowed synchronous results.
   if (input_.matches_requested() != AutocompleteInput::ALL_MATCHES)
     return;
 
-  // We'll have at least one pending fetch. Set it to 1 now, but the value is
-  // correctly set in Run. As Run isn't invoked immediately we need to set this
-  // now, else we won't think we're waiting on results from the server when we
-  // really are.
-  suggest_results_pending_ = 1;
-
   // Kick off a timer that will start the URL fetch if it completes before
   // the user types another character.  Requests may be delayed to avoid
   // flooding the server with requests that are likely to be thrown away later
   // anyway.
   timer_.Start(FROM_HERE, GetSuggestQueryDelay(), this, &SearchProvider::Run);
 }
 
 bool SearchProvider::IsQuerySuitableForSuggest() const {
   // Don't run Suggest in incognito mode, if the engine doesn't support it, or
   // if the user has disabled it.
@@ skipping 46 matching lines @@
       parts.path.is_nonempty())
     return false;
 
   return true;
 }
 
 void SearchProvider::StopSuggest() {
   // Increment the appropriate field in the histogram by the number of
   // pending requests that were invalidated.
   for (int i = 0; i < suggest_results_pending_; i++)
     LogOmniboxSuggestRequest(REQUEST_INVALIDATED);

[msw, 2012/08/21 19:16:19]

FYI, we may see a reduction in REQUEST_INVALIDATED.

   suggest_results_pending_ = 0;
   timer_.Stop();
   // Stop any in-progress URL fetches.
   keyword_fetcher_.reset();
   default_fetcher_.reset();
 }
 
 void SearchProvider::ClearResults() {
   keyword_suggest_results_.clear();
   default_suggest_results_.clear();
@@ skipping 645 matching lines @@
       match.contents.length(), ACMatchClassification::URL,
       &match.contents_class);
 
   match.description = navigation.description();
   AutocompleteMatch::ClassifyMatchInString(input, match.description,
       ACMatchClassification::NONE, &match.description_class);
   return match;
 }
 
 void SearchProvider::UpdateDone() {
-  // We're done when there are no more suggest queries pending (this is set to 1
-  // when the timer is started) and we're not waiting on instant.
-  done_ = ((suggest_results_pending_ == 0) &&
+  // We're done when the timer isn't running, there are no suggest queries
+  // pending, and we're not waiting on instant.
+  done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) &&
            (instant_finalized_ || !InstantController::IsEnabled(profile_)));
 }