Omnibox: Speed Up SearchProviderTest

chrome/browser/autocomplete/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 "chrome/browser/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 103 matching lines @@
       template_url_service_->GetTemplateURLForKeyword(keyword_provider_);
 }
 
 
 // SearchProvider -------------------------------------------------------------
 
 // static
 const int SearchProvider::kDefaultProviderURLFetcherID = 1;
 // static
 const int SearchProvider::kKeywordProviderURLFetcherID = 2;
+// static
+// To avoid flooding the suggest server, don't send a query until at least 100

[msw, 2013/04/03 21:46:08]

nit: keep this comment with its use in StartOrStopSuggestQuery or move it to the
declaration in the header.

[Mark P, 2013/04/03 22:51:40]

Done.  Moved back to old location.

+// ms since the last query.
+int SearchProvider::kMinimumTimeBetweenSuggestQueriesMs = 100;
 
 SearchProvider::SearchProvider(AutocompleteProviderListener* listener,
                                Profile* profile)
     : AutocompleteProvider(listener, profile,
           AutocompleteProvider::TYPE_SEARCH),
       providers_(TemplateURLServiceFactory::GetForProfile(profile)),
       suggest_results_pending_(0),
       has_default_suggested_relevance_(false),
       has_keyword_suggested_relevance_(false),
       default_verbatim_relevance_(-1),
@@ skipping 421 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;
 
-  // To avoid flooding the suggest server, don't send a query until at least 100
-  // ms since the last query.
-  const int kMinimumTimeBetweenSuggestQueriesMs = 100;
   base::TimeTicks next_suggest_time(time_suggest_request_sent_ +
       TimeDelta::FromMilliseconds(kMinimumTimeBetweenSuggestQueriesMs));
   base::TimeTicks now(base::TimeTicks::Now());
   if (now >= next_suggest_time) {
     Run();
     return;
   }
   timer_.Start(FROM_HERE, next_suggest_time - now, this, &SearchProvider::Run);
 }
 
@@ skipping 932 matching lines @@
   }
   return true;
 }
 
 void SearchProvider::UpdateDone() {
   // 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_ || !chrome::IsInstantEnabled(profile_)));
 }