Index: chrome/browser/autocomplete/zero_suggest_provider.cc |
diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc |
index 812cef888ab6c5315f4e9b372046356d2a317471..300e1a8109c876d496e4f5abba5dce407eecec69 100644 |
--- a/chrome/browser/autocomplete/zero_suggest_provider.cc |
+++ b/chrome/browser/autocomplete/zero_suggest_provider.cc |
@@ -33,10 +33,10 @@ |
#include "components/omnibox/search_provider.h" |
#include "components/pref_registry/pref_registry_syncable.h" |
#include "components/search_engines/template_url_service.h" |
+#include "components/url_formatter/url_formatter.h" |
#include "components/variations/net/variations_http_header_provider.h" |
#include "net/base/escape.h" |
#include "net/base/load_flags.h" |
-#include "net/base/net_util.h" |
#include "net/http/http_request_headers.h" |
#include "net/url_request/url_fetcher.h" |
#include "net/url_request/url_request_status.h" |
@@ -299,8 +299,9 @@ AutocompleteMatch ZeroSuggestProvider::NavigationToMatch( |
// Zero suggest results should always omit protocols and never appear bold. |
const std::string languages( |
profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)); |
- match.contents = net::FormatUrl(navigation.url(), languages, |
- net::kFormatUrlOmitAll, net::UnescapeRule::SPACES, NULL, NULL, NULL); |
+ match.contents = url_formatter::FormatUrl( |
+ navigation.url(), languages, url_formatter::kFormatUrlOmitAll, |
+ net::UnescapeRule::SPACES, nullptr, nullptr, nullptr); |
match.fill_into_edit += |
AutocompleteInput::FormattedStringWithEquivalentMeaning(navigation.url(), |
match.contents, ChromeAutocompleteSchemeClassifier(profile_)); |