Move net::FormatUrl and friends outside of //net and into //components

chrome/browser/android/omnibox/autocomplete_controller_android.cc

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 37b8b1bc222c266f3e51f111b806bc7b59fd3ecf..60b66837652aeb62650594a5c265733f1cec8562 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -43,6 +43,7 @@
 #include "components/search/search.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/toolbar/toolbar_model.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"
@@ -50,7 +51,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;
@@ -477,8 +477,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>