HQP Refactoring (in Preparation for SQLite Cache)

chrome/browser/autocomplete/history_quick_provider.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_HISTORY_QUICK_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_QUICK_PROVIDER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 19 matching lines @@
 
   virtual ~HistoryQuickProvider();
 
   // AutocompleteProvider. |minimal_changes| is ignored since there
   // is no asynch completion performed.
   virtual void Start(const AutocompleteInput& input,
                      bool minimal_changes) OVERRIDE;
 
   virtual void DeleteMatch(const AutocompleteMatch& match) OVERRIDE;
 
-  // Performs the autocomplete matching and scoring.
-  void DoAutocomplete();
-
   // Disable this provider. For unit testing purposes only. This is required
   // because this provider is closely associated with the HistoryURLProvider
   // and in order to properly test the latter the HistoryQuickProvider must
   // be disabled.
   // TODO(mrossetti): Eliminate this once the HUP has been refactored.
   static void set_disabled(bool disabled) { disabled_ = disabled; }
 
  private:
   friend class HistoryQuickProviderTest;
   FRIEND_TEST_ALL_PREFIXES(HistoryQuickProviderTest, Spans);
   FRIEND_TEST_ALL_PREFIXES(HistoryQuickProviderTest, Relevance);
 
+  // The initial maximum allowable score for a match which cannot be inlined.
+  static const int kMaxNonInliningScore;

[Peter Kasting, 2011/10/05 00:11:42]

I suspect this is leftover from merges, since we removed this constant in the
static initializer purge (
http://src.chromium.org/viewvc/chrome?view=rev&revision=99036 ).

[mrossetti, 2011/10/07 17:04:14]

Done.

+
+  // Performs the autocomplete matching and scoring.
+  void DoAutocomplete();
+
   // Creates an AutocompleteMatch from |history_match|. |max_match_score| gives
   // the maximum possible score for the match. |history_matches| is the full set
   // of matches to compare each match to when calculating confidence.
   AutocompleteMatch QuickMatchToACMatch(
       const history::ScoredHistoryMatch& history_match,
       const history::ScoredHistoryMatches& history_matches,
       bool prevent_inline_autocomplete,
       int* max_match_score);
 
   // Determines the relevance score of |history_match|. The maximum allowed
   // score for the match is passed in |max_match_score|. The |max_match_score|
   // is always set to the resulting score minus 1 whenever the match's score
   // has to be limited or is <= to |max_match_score|. This function should be
   // called in a loop with each match in decreasing order of raw score.
   static int CalculateRelevance(
       const history::ScoredHistoryMatch& history_match,
       int* max_match_score);
 
   // Returns the index that should be used for history lookups.
   history::InMemoryURLIndex* GetIndex();
 
   // Fill and return an ACMatchClassifications structure given the term
   // matches (|matches|) to highlight where terms were found.
   static ACMatchClassifications SpansFromTermMatch(
       const history::TermMatches& matches,
       size_t text_length,
       bool is_url);
 
   // Only for use in unittests.  Takes ownership of |index|.
-  void SetIndexForTesting(history::InMemoryURLIndex* index);
+  void set_index(history::InMemoryURLIndex* index);
+
   AutocompleteInput autocomplete_input_;
   std::string languages_;
 
   // Only used for testing.
   scoped_ptr<history::InMemoryURLIndex> index_for_testing_;
 
   // This provider is disabled when true.
   static bool disabled_;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_QUICK_PROVIDER_H_