Optimize shortcuts provider

components/omnibox/browser/shortcuts_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.
 
 #ifndef COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_PROVIDER_H_
 #define COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_PROVIDER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/shortcuts_backend.h"
 
 class AutocompleteProviderClient;
 class ShortcutsProviderTest;
+struct ShortcutMatch;
 
 // Provider of recently autocompleted links. Provides autocomplete suggestions
 // from previously selected suggestions. The more often a user selects a
 // suggestion for a given search term the higher will be that suggestion's
 // ranking for future uses of that search term.
 class ShortcutsProvider : public AutocompleteProvider,
                           public ShortcutsBackend::ShortcutsBackendObserver {
  public:
   explicit ShortcutsProvider(AutocompleteProviderClient* client);
 
   // Performs the autocompletion synchronously. Since no asynch completion is
   // performed |minimal_changes| is ignored.
   void Start(const AutocompleteInput& input, bool minimal_changes) override;
 
   void DeleteMatch(const AutocompleteMatch& match) override;
 
  private:
   friend class ClassifyTest;
   friend class ShortcutsProviderExtensionTest;
   friend class ShortcutsProviderTest;
   FRIEND_TEST_ALL_PREFIXES(ShortcutsProviderTest, CalculateScore);
+  FRIEND_TEST_ALL_PREFIXES(ShortcutsProviderTest,
+                           DedupShortcutMatchesByDestination);
 
   typedef std::multimap<base::char16, base::string16> WordMap;
 
   ~ShortcutsProvider() override;
 
   // ShortcutsBackendObserver:
   void OnShortcutsLoaded() override;
 
   // Performs the autocomplete matching and scoring.
   void GetMatches(const AutocompleteInput& input);
 
   // Returns an AutocompleteMatch corresponding to |shortcut|. Assigns it
   // |relevance| score in the process, and highlights the description and
   // contents against |input|, which should be the lower-cased version of
   // the user's input. |input| and |fixed_up_input_text| are used to decide
   // what can be inlined.
-  AutocompleteMatch ShortcutToACMatch(
-      const ShortcutsDatabase::Shortcut& shortcut,
-      int relevance,
+  AutocompleteMatch ShortcutMatchToACMatch(
+      const ShortcutMatch& shortcut_match,
       const AutocompleteInput& input,
-      const base::string16& fixed_up_input_text);
+      const base::string16& fixed_up_input_text,
+      const base::string16 term_string,
+      const WordMap& terms_map);
 
   // Returns a map mapping characters to groups of words from |text| that start
   // with those characters, ordered lexicographically descending so that longer
   // words appear before their prefixes (if any) within a particular
   // equal_range().
   static WordMap CreateWordMapForString(const base::string16& text);
 
   // Given |text| and a corresponding base set of classifications
   // |original_class|, adds ACMatchClassification::MATCH markers for all
   // instances of the words from |find_words| within |text| and returns the
@@ skipping 23 matching lines @@
   // Returns iterator to first item in |shortcuts_map_| matching |keyword|.
   // Returns shortcuts_map_.end() if there are no matches.
   ShortcutsBackend::ShortcutMap::const_iterator FindFirstMatch(
       const base::string16& keyword,
       ShortcutsBackend* backend);
 
   int CalculateScore(const base::string16& terms,
                      const ShortcutsDatabase::Shortcut& shortcut,
                      int max_relevance);
 
+  // Function removes duplicates from vector of ShortcutMatch objects.
+  // Deduplication algorithm is the same as used in
+  // AutocompleteResult::DedupMatchesByDestination.
+  // Matches with higher relevance are left from duplicates.

[Peter Kasting, 2016/04/12 23:29:50]

Nit: Let's use a similar comment to what's in AutocompleteResult:

  // Sorts |matches| by destination, taking into account demotions based on
  // |page_classification| when resolving ties about which of several
  // duplicates to keep.  The matches are also deduplicated.

I also suggest renaming this function, and the one in AutocompleteResult,
SortAndDedupMatches().

Also, if we're going to be adding another private static method to this class,
can we collect all the static methods together in one group (in the .h and .cc
files)?  I would put them above the private virtual methods.

[Alexander Yashkin, 2016/04/13 09:29:36]

Done, thanks.

+  static void DedupShortcutMatchesByDestination(
+      metrics::OmniboxEventProto::PageClassification page_classification,
+      std::vector<ShortcutMatch>* matches);
+
   // The default max relevance unless overridden by a field trial.
   static const int kShortcutsProviderDefaultMaxRelevance;
 
   AutocompleteProviderClient* client_;
   std::string languages_;
   bool initialized_;
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_PROVIDER_H_