Index: chrome/browser/android/omnibox/autocomplete_controller_android.cc |
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc |
index 7a85f8ab27b2642e8aa932ab0406d6b7138f8b4e..2efaa089443ebe6a84ef160909fb9a0121004169 100644 |
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc |
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc |
@@ -41,6 +41,7 @@ |
#include "components/omnibox/search_provider.h" |
#include "components/search/search.h" |
#include "components/search_engines/template_url_service.h" |
+#include "components/url_formatter/url_formatter.h" |
#include "content/public/browser/notification_details.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/notification_source.h" |
@@ -48,7 +49,6 @@ |
#include "content/public/common/url_constants.h" |
#include "jni/AutocompleteController_jni.h" |
#include "net/base/escape.h" |
-#include "net/base/net_util.h" |
#include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
using base::android::AttachCurrentThread; |
@@ -470,8 +470,9 @@ base::string16 AutocompleteControllerAndroid::FormatURLUsingAcceptLanguages( |
std::string languages( |
profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)); |
- return net::FormatUrl(url, languages, net::kFormatUrlOmitAll, |
- net::UnescapeRule::SPACES, NULL, NULL, NULL); |
+ return url_formatter::FormatUrl( |
+ url, languages, url_formatter::kFormatUrlOmitAll, |
+ net::UnescapeRule::SPACES, nullptr, nullptr, nullptr); |
} |
ScopedJavaLocalRef<jobject> |