[AiS] Use top local result for prefetch.

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 230 matching lines @@
   void AddNavigationResultsToMatches(
       const SearchSuggestionParser::NavigationResults& navigation_results,
       ACMatches* matches);
 
   // Adds a match for each result in |results| to |map|. |is_keyword| indicates
   // whether the results correspond to the keyword provider or default provider.
   void AddHistoryResultsToMap(const HistoryResults& results,
                               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(
       const HistoryResults& results,
       bool base_prevent_inline_autocomplete,
       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,
       const std::string& metadata,
       MatchMap* map);
 
   // Gets the relevance score for the verbatim result.  This value may be
   // provided by the suggest server or calculated locally; if
   // |relevance_from_server| is non-NULL, it will be set to indicate which of
   // those is true.
   int GetVerbatimRelevance(bool* relevance_from_server) const;
@@ skipping 32 matching lines @@
   AutocompleteMatch NavigationToMatch(
       const SearchSuggestionParser::NavigationResult& navigation);
 
   // Updates the value of |done_| from the internal state.
   void UpdateDone();
 
   // Obtains a session token, regenerating if necessary.
   std::string GetSessionToken();
 
   // 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.
   static int kMinimumTimeBetweenSuggestQueriesMs;
 
   AutocompleteProviderListener* listener_;
 
   // The number of suggest results that haven't yet arrived. If it's greater
   // than 0, it indicates that one of the URLFetchers is still running.
   int suggest_results_pending_;
 
   // Maintains the TemplateURLs used.
   Providers providers_;
 
   // The user's input.
   AutocompleteInput input_;
 
   // Input when searching against the keyword provider.
   AutocompleteInput keyword_input_;
 
   // Searches in the user's history that begin with the input text.
   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_;
 
   // The time at which we sent a query to the suggest server.
   base::TimeTicks time_suggest_request_sent_;
 
   // Fetchers used to retrieve results for the keyword and default providers.
   scoped_ptr<net::URLFetcher> keyword_fetcher_;
   scoped_ptr<net::URLFetcher> default_fetcher_;
 
   // Results from the default and keyword search providers.
   SearchSuggestionParser::Results default_results_;
   SearchSuggestionParser::Results keyword_results_;
 
   GURL current_page_url_;
 
   // Session token management.
   std::string current_token_;
   base::TimeTicks token_expiration_time_;
 
   // Answers prefetch management.
   AnswersCache answers_cache_;  // Cache for last answers seen.
   AnswersQueryData prefetch_data_;  // Data to use for query prefetching.
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_