Index: chrome/browser/autocomplete/bookmark_provider.cc |
diff --git a/chrome/browser/autocomplete/bookmark_provider.cc b/chrome/browser/autocomplete/bookmark_provider.cc |
index 297089def367a31bb60fb50c794caecfa070adad..68c1755675bf79d29daaa54de7cc07fc1696ef0f 100644 |
--- a/chrome/browser/autocomplete/bookmark_provider.cc |
+++ b/chrome/browser/autocomplete/bookmark_provider.cc |
@@ -21,7 +21,7 @@ |
#include "components/metrics/proto/omnibox_input_type.pb.h" |
#include "components/omnibox/autocomplete_result.h" |
#include "components/omnibox/url_prefix.h" |
-#include "net/base/net_util.h" |
+#include "components/url_formatter/url_formatter.h" |
#include "url/url_constants.h" |
using bookmarks::BookmarkMatch; |
@@ -192,9 +192,10 @@ AutocompleteMatch BookmarkProvider::BookmarkMatchToACMatch( |
// |offsets|, compute how everything is transformed, then remove it from the |
// end. |
offsets.push_back(inline_autocomplete_offset); |
- match.contents = net::FormatUrlWithOffsets(url, languages_, |
- net::kFormatUrlOmitAll & ~(trim_http ? 0 : net::kFormatUrlOmitHTTP), |
- net::UnescapeRule::SPACES, NULL, NULL, &offsets); |
+ match.contents = url_formatter::FormatUrlWithOffsets( |
+ url, languages_, url_formatter::kFormatUrlOmitAll & |
+ ~(trim_http ? 0 : url_formatter::kFormatUrlOmitHTTP), |
+ net::UnescapeRule::SPACES, nullptr, nullptr, &offsets); |
inline_autocomplete_offset = offsets.back(); |
offsets.pop_back(); |
BookmarkMatch::MatchPositions new_url_match_positions = |