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

components/omnibox/browser/url_index_private_data.cc

Index: components/omnibox/browser/url_index_private_data.cc
diff --git a/components/omnibox/browser/url_index_private_data.cc b/components/omnibox/browser/url_index_private_data.cc
index a468d2b6624e5258da96bf2c31ff165de849f909..a965c86e7a190ea8fc9c5f7c87c7bae55f2f2065 100644
--- a/components/omnibox/browser/url_index_private_data.cc
+++ b/components/omnibox/browser/url_index_private_data.cc
@@ -26,7 +26,7 @@
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/omnibox/browser/in_memory_url_index.h"
-#include "components/url_formatter/url_formatter.h"
+#include "net/base/net_util.h"
 
 #if defined(USE_SYSTEM_PROTOBUF)
 #include <google/protobuf/repeated_field.h>
@@ -707,9 +707,10 @@
 
   history::URLID row_id = row.id();
   // Strip out username and password before saving and indexing.
-  base::string16 url(url_formatter::FormatUrl(
-      gurl, languages, url_formatter::kFormatUrlOmitUsernamePassword,
-      net::UnescapeRule::NONE, nullptr, nullptr, nullptr));
+  base::string16 url(net::FormatUrl(gurl, languages,
+      net::kFormatUrlOmitUsernamePassword,
+      net::UnescapeRule::NONE,
+      NULL, NULL, NULL));
 
   HistoryID history_id = static_cast<HistoryID>(row_id);
   DCHECK_LT(history_id, std::numeric_limits<HistoryID>::max());