Omnibox: Speed Up SearchProviderTest

chrome/browser/autocomplete/search_provider.h

 // 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all autocomplete entries that start with "Search <engine>
 // for ...", including searching for the current input string, search
 // history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
@@ skipping 10 matching lines @@
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/instant_types.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
+class SearchProviderTest;

[msw, 2013/04/03 23:28:48]

nit: alphabetize this.

[Mark P, 2013/04/03 23:58:39]

Done.

 class Profile;
 class TemplateURLService;
 
 namespace base {
 class Value;
 }
 
 namespace net {
 class URLFetcher;
 }
@@ skipping 37 matching lines @@
   virtual void ResetSession() OVERRIDE;
 
   // net::URLFetcherDelegate
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   bool field_trial_triggered_in_session() const {
     return field_trial_triggered_in_session_;
   }
 
   // ID used in creating URLFetcher for default provider's suggest results.
   static const int kDefaultProviderURLFetcherID;

[msw, 2013/04/03 23:28:48]

optional nit: move this and kKeywordProviderURLFetcherID to line 56 before the
SearchProvider ctor to conform to the C++ style guide.

[Mark P, 2013/04/03 23:58:39]

Done.

 
   // ID used in creating URLFetcher for keyword provider's suggest results.
   static const int kKeywordProviderURLFetcherID;
 
  private:
+  friend class SearchProviderTest;
   FRIEND_TEST_ALL_PREFIXES(SearchProviderTest, SuggestRelevanceExperiment);
   FRIEND_TEST_ALL_PREFIXES(SearchProviderTest, NavigationInline);
   FRIEND_TEST_ALL_PREFIXES(SearchProviderTest, NavigationInlineSchemeSubstring);
   FRIEND_TEST_ALL_PREFIXES(SearchProviderTest, NavigationInlineDomainClassify);
   FRIEND_TEST_ALL_PREFIXES(AutocompleteProviderTest, GetDestinationURL);
 
   virtual ~SearchProvider();
 
   // Manages the providers (TemplateURLs) used by SearchProvider. Two providers
   // may be used:
@@ skipping 135 matching lines @@
     string16 description_;
   };
 
   typedef std::vector<SuggestResult> SuggestResults;
   typedef std::vector<NavigationResult> NavigationResults;
   typedef std::vector<history::KeywordSearchTermVisit> HistoryResults;
   typedef std::map<string16, AutocompleteMatch> MatchMap;
 
   class CompareScoredResults;
 
+  // The amount of time to wait before sending a new suggest request after
+  // the previous one.
+  static int kMinimumTimeBetweenSuggestQueriesMs;

[msw, 2013/04/03 23:28:48]

This belongs at line 102 before "virtual ~SearchProvider();" if you wish for it
to be private and conform to the C++ style guide.

[Mark P, 2013/04/03 23:58:39]

Done.

+
   // Called when timer_ expires.
   void Run();
 
   // Runs the history query, if necessary. The history query is synchronous.
   // This does not update |done_|.
   void DoHistoryQuery(bool minimal_changes);
 
   // Determines whether an asynchronous subcomponent query should run for the
   // current input.  If so, starts it if necessary; otherwise stops it.
   // NOTE: This function does not update |done_|.  Callers must do so.
@@ skipping 202 matching lines @@
   bool field_trial_triggered_;
 
   // Same as above except that it is maintained across the current Omnibox
   // session.
   bool field_trial_triggered_in_session_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_