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

components/omnibox/browser/omnibox_edit_model.cc

Index: components/omnibox/browser/omnibox_edit_model.cc
diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
index 42852388b66c4acc50bb728e9749ae2f1c8b6f37..8b2355f16ce103e8f99e1ca56298835f60aea2c0 100644
--- a/components/omnibox/browser/omnibox_edit_model.cc
+++ b/components/omnibox/browser/omnibox_edit_model.cc
@@ -36,7 +36,7 @@
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/toolbar/toolbar_model.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
 #include "ui/gfx/image/image.h"
 #include "url/url_util.h"
 
@@ -299,7 +299,8 @@ bool OmniboxEditModel::UpdatePermanentText() {
 }
 
 GURL OmniboxEditModel::PermanentURL() {
-  return url_fixer::FixupURL(base::UTF16ToUTF8(permanent_text_), std::string());
+  return url_formatter::FixupURL(base::UTF16ToUTF8(permanent_text_),
+                                 std::string());
 }
 
 void OmniboxEditModel::SetUserText(const base::string16& text) {