Factor out AutocompleteMatch creation from BookmarkProvider

components/bookmarks/browser/titled_url_match.h

 // Copyright 2014 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_BOOKMARKS_BROWSER_TITLED_URL_MATCH_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_TITLED_URL_MATCH_H_
 
 #include <stddef.h>
 
 #include <cstddef>
 #include <utility>
 #include <vector>
 
+#include "base/strings/string16.h"
+
 namespace bookmarks {
 
 class TitledUrlNode;
 
 struct TitledUrlMatch {
   // Each MatchPosition is the [begin, end) positions of a match within a
   // string.
   using MatchPosition = std::pair<size_t, size_t>;
   using MatchPositions = std::vector<MatchPosition>;
 
   TitledUrlMatch();
   TitledUrlMatch(const TitledUrlMatch& other);
   ~TitledUrlMatch();
 
   // Extracts and returns the offsets from |match_positions|.
   static std::vector<size_t> OffsetsFromMatchPositions(
       const MatchPositions& match_positions);
 
   // Replaces the offsets in |match_positions| with those given in |offsets|,
   // deleting any which are npos, and returns the updated list of match
   // positions.
   static MatchPositions ReplaceOffsetsInMatchPositions(
       const MatchPositions& match_positions,
       const std::vector<size_t>& offsets);
 
+  // Removes leading spaces from |title| before displaying, otherwise it looks
+  // funny.  In the process, corrects |title_match_positions| so the correct
+  // characters are highlighted.
+  static void CorrectTitleAndMatchPositions(
+      base::string16* title, MatchPositions* title_match_positions);

[Mark P, 2016/12/23 22:38:49]

nit: This parameter spacing looks odd to me.  Did you run this changelist
through git cl format?

[mattreynolds, 2017/01/04 00:58:02]

Done.

+
   // The matching node of a query.
   const TitledUrlNode* node;
 
   // Location of the matching words in the title of the node.
   MatchPositions title_match_positions;
 
   // Location of the matching words in the URL of the node.
   MatchPositions url_match_positions;
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_TITLED_URL_MATCH_H_