Factor out AutocompleteMatch creation from BookmarkProvider

components/omnibox/browser/titled_url_match_utils.h

Index: components/omnibox/browser/titled_url_match_utils.h
diff --git a/components/omnibox/browser/titled_url_match_utils.h b/components/omnibox/browser/titled_url_match_utils.h
new file mode 100644
index 0000000000000000000000000000000000000000..ea7a42522b9925f04b05cea22ba2a616425c81a2
--- /dev/null
+++ b/components/omnibox/browser/titled_url_match_utils.h
@@ -0,0 +1,42 @@
+// Copyright (c) 2016 The Chromium Authors. All rights reserved.

[Mark P, 2017/01/06 06:06:09]

Please use the correct year in this new file and its .cc and test.

[mattreynolds, 2017/01/06 18:03:50]

Happy New Year!

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_OMNIBOX_BROWSER_TITLED_URL_MATCH_UTILS_H_
+#define COMPONENTS_OMNIBOX_BROWSER_TITLED_URL_MATCH_UTILS_H_
+
+#include "base/strings/string16.h"
+#include "components/bookmarks/browser/titled_url_match.h"
+#include "components/omnibox/browser/autocomplete_match_type.h"
+
+class AutocompleteInput;
+class AutocompleteProvider;
+class AutocompleteSchemeClassifier;
+struct AutocompleteMatch;
+
+namespace bookmarks {
+
+// Compose an AutocompleteMatch based on |match| that has the match's URL and
+// page title, type |type|, and relevance score |relevance|. |input| is used to
+// compute the match's inline_autocompletion. |fixed_up_input_text| is used in
+// that way as well; it's passed separately so this function doesn't have to
+// compute it.
+AutocompleteMatch TitledUrlMatchToAutocompleteMatch(
+    const TitledUrlMatch& match,
+    AutocompleteMatchType::Type type,
+    int relevance,
+    AutocompleteProvider* provider,
+    const AutocompleteSchemeClassifier& scheme_classifier,
+    const AutocompleteInput& input,
+    const base::string16& fixed_up_input_text);
+
+// Removes leading spaces from |title| before displaying, otherwise it looks
+// funny. In the process, corrects |title_match_positions| so the correct
+// characters are highlighted.
+void CorrectTitleAndMatchPositions(
+    base::string16* title,
+    TitledUrlMatch::MatchPositions* title_match_positions);
+
+}  // namespace bookmarks
+
+#endif  // COMPONENTS_OMNIBOX_BROWSER_TITLED_URL_MATCH_UTILS_H_