Factor out AutocompleteMatch creation from BookmarkProvider

components/omnibox/browser/bookmark_provider_unittest.cc

 // 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.
 
 #include "components/omnibox/browser/bookmark_provider.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/titled_url_match.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/mock_autocomplete_provider_client.h"
 #include "components/omnibox/browser/test_scheme_classifier.h"
+#include "components/omnibox/browser/titled_url_match_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 using bookmarks::TitledUrlMatch;
 
 namespace {
 
 // The bookmark corpus against which we will simulate searches.
@@ skipping 377 matching lines @@
     AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query),
                             base::string16::npos, std::string(), GURL(),
                             metrics::OmniboxEventProto::INVALID_SPEC, false,
                             false, false, true, false, TestSchemeClassifier());
     const base::string16 fixed_up_input(
         provider_->FixupUserInput(input).second);
     BookmarkNode node(GURL(query_data[i].url));
     node.SetTitle(base::ASCIIToUTF16(query_data[i].url));
     TitledUrlMatch bookmark_match;
     bookmark_match.node = &node;
-    const AutocompleteMatch& ac_match = provider_->TitledUrlMatchToACMatch(
-        input, fixed_up_input, bookmark_match);
+    int relevance = provider_->CalculateBookmarkMatchRelevance(bookmark_match);
+    const AutocompleteMatch& ac_match = TitledUrlMatchToAutocompleteMatch(
+        bookmark_match, AutocompleteMatchType::BOOKMARK_TITLE, relevance,
+        provider_.get(), classifier_, input, fixed_up_input);
     EXPECT_EQ(query_data[i].allowed_to_be_default_match,
               ac_match.allowed_to_be_default_match) << description;
     EXPECT_EQ(base::ASCIIToUTF16(query_data[i].inline_autocompletion),
               ac_match.inline_autocompletion) << description;
   }
 }
 
 TEST_F(BookmarkProviderTest, StripHttpAndAdjustOffsets) {
   // Simulate searches.
   struct QueryData {
@@ skipping 47 matching lines @@
 }
 
 TEST_F(BookmarkProviderTest, DoesNotProvideMatchesOnFocus) {
   AutocompleteInput input(base::ASCIIToUTF16("foo"), base::string16::npos,
                           std::string(), GURL(),
                           metrics::OmniboxEventProto::INVALID_SPEC, false,
                           false, false, true, true, TestSchemeClassifier());
   provider_->Start(input, false);
   EXPECT_TRUE(provider_->matches().empty());
 }