[AiS] Use top local result for prefetch.

chrome/browser/autocomplete/search_provider.h

Index: chrome/browser/autocomplete/search_provider.h
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index 8ee4bd8c34a9e020461bebe3be45f3a58283b4f7..ad31a10d3792571e096ac8c0ecfbd109aed7c6ce 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -248,6 +248,11 @@ class SearchProvider : public BaseSearchProvider,
                               bool is_keyword,
                               int did_not_accept_suggestion,
                               MatchMap* map);
+  // Adds a match for each scored result in |results| to |map|.

[Mark P, 2014/09/05 22:18:16]

I don't really like the notion of calling these "scored" results.  While it's
true that they have relevance scores, I think the bigger difference is that
these results are already converted into SuggestResults.  Can you think of
better terminology?  Perhaps the first function could be
AddRawHistoryResultsToMap() and the second could be
AddTransformedHistoryResultsToMap().  Or perhaps you have a better idea?

If you take this suggestion, please search through this changelist for "scored"
and revise the variable names and comments appropriately.  And maybe change the
original un-scored variable names to "raw" or whatever you decide.

[Mark P, 2014/09/05 22:18:16]

nit: missing blank line

[groby-ooo-7-16, 2014/09/10 23:21:38]

Done.

[groby-ooo-7-16, 2014/09/10 23:21:38]

Not really, so I'll stick with the suggestion :)
Done.

+  void AddScoredHistoryResultsToMap(
+      const SearchSuggestionParser::SuggestResults& results,
+      int did_not_accept_suggestion,
+      MatchMap* map);
 
   // Calculates relevance scores for all |results|.
   SearchSuggestionParser::SuggestResults ScoreHistoryResults(
@@ -256,7 +261,10 @@ class SearchProvider : public BaseSearchProvider,
       bool input_multiple_words,
       const base::string16& input_text,
       bool is_keyword);
-
+  void ScoreHistoryResultsMultiWord(

[Mark P, 2014/09/05 22:18:16]

I originally read this and added the comment
"optional nit: MultiWord -> MultiWordInput"
but reading the code I find that I'm interpreting this wrong.

What is it supposed to mean?  Please give it a better name.

Here's one idea:  isn't this now the primary ScoreHistoryResults function and
the original is merely a helper function, e.g., ScoreHistoryResultsHelper?

[groby-ooo-7-16, 2014/09/10 23:21:38]

The name is based on the comment in DoHistoryQuery[1] and 
AddHistoryResultsToMap[2]

As far as I can tell, it's essentially adjusting scoring for multi-words if the
current input is a prefix for a multi-word suggestion.

The original is still doing scoring, this is just doing adjustments to that
scoring for specific multi-word cases. So "Helper" would not really capture it.
And I can't come up with a good one, except maybe ScoreHistoryResultsAdjusted.
Which is not too hot either. Ideas?

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/components/omnibox...
[2]
https://code.google.com/p/chromium/codesearch#chromium/src/components/omnibox...

+      const HistoryResults& results,
+      bool is_keyword,
+      SearchSuggestionParser::SuggestResults* scored_results);
   // Adds matches for |results| to |map|.

[Mark P, 2014/09/05 22:18:16]

nit: missing blank line

[groby-ooo-7-16, 2014/09/10 23:21:38]

Done.

   void AddSuggestResultsToMap(
       const SearchSuggestionParser::SuggestResults& results,
@@ -311,7 +319,7 @@ class SearchProvider : public BaseSearchProvider,
 
   // Answers prefetch handling - finds previously displayed answer matching the
   // current |input| and sets |prefetch_data_|.

[Mark P, 2014/09/05 22:18:16]

This comment doesn't seem appropriate anymore.  Please revise.

[groby-ooo-7-16, 2014/09/10 23:21:38]

Done.

-  void DoAnswersQuery(const AutocompleteInput& input);
+  AnswersQueryData FindAnswersPrefetchData(const base::string16& input);
 
   // The amount of time to wait before sending a new suggest request after the
   // previous one.  Non-const because some unittests modify this value.
@@ -336,6 +344,10 @@ class SearchProvider : public BaseSearchProvider,
   HistoryResults keyword_history_results_;
   HistoryResults default_history_results_;
 
+  // Scored searches in the user's history - based on xxx_history_results_.

[Mark P, 2014/09/05 22:18:16]

nit: xxx_history_results_. -> keyword_history_results_ or
default_history_results_ as appropriate.

[groby-ooo-7-16, 2014/09/10 23:21:38]

Done.

+  SearchSuggestionParser::SuggestResults scored_keyword_history_results_;
+  SearchSuggestionParser::SuggestResults scored_default_history_results_;
+
   // A timer to start a query to the suggest server after the user has stopped
   // typing for long enough.
   base::OneShotTimer<SearchProvider> timer_;