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

components/omnibox/browser/bookmark_provider.cc

Index: components/omnibox/browser/bookmark_provider.cc
diff --git a/components/omnibox/browser/bookmark_provider.cc b/components/omnibox/browser/bookmark_provider.cc
index fc55713a729b79139dcbf5a860dc27cec6543d37..ffce9b8f92345e63b0437351dc1b9c34a741c86c 100644
--- a/components/omnibox/browser/bookmark_provider.cc
+++ b/components/omnibox/browser/bookmark_provider.cc
@@ -18,7 +18,7 @@
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/history_provider.h"
 #include "components/omnibox/browser/url_prefix.h"
-#include "components/url_formatter/url_formatter.h"
+#include "net/base/net_util.h"
 #include "url/url_constants.h"
 
 using bookmarks::BookmarkMatch;
@@ -188,10 +188,9 @@
   // |offsets|, compute how everything is transformed, then remove it from the
   // end.
   offsets.push_back(inline_autocomplete_offset);
-  match.contents = url_formatter::FormatUrlWithOffsets(
-      url, languages_, url_formatter::kFormatUrlOmitAll &
-                           ~(trim_http ? 0 : url_formatter::kFormatUrlOmitHTTP),
-      net::UnescapeRule::SPACES, nullptr, nullptr, &offsets);
+  match.contents = net::FormatUrlWithOffsets(url, languages_,
+      net::kFormatUrlOmitAll & ~(trim_http ? 0 : net::kFormatUrlOmitHTTP),
+      net::UnescapeRule::SPACES, NULL, NULL, &offsets);
   inline_autocomplete_offset = offsets.back();
   offsets.pop_back();
   BookmarkMatch::MatchPositions new_url_match_positions =