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

components/history/core/browser/url_database.cc

Index: components/history/core/browser/url_database.cc
diff --git a/components/history/core/browser/url_database.cc b/components/history/core/browser/url_database.cc
index 48847b4bbed852155b284defd9d69e091ed548b1..65ac67e8e9717e9a5f8511b7fd3d7d0e2b5e4a95 100644
--- a/components/history/core/browser/url_database.cc
+++ b/components/history/core/browser/url_database.cc
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/history/core/browser/keyword_search_term.h"
-#include "components/url_formatter/url_formatter.h"
+#include "net/base/net_util.h"
 #include "sql/statement.h"
 #include "url/gurl.h"
 
@@ -372,8 +372,7 @@
       // |query_words| won't be shown to user - therefore we can use empty
       // |languages| to reduce dependency (no need to call PrefService).
       base::string16 ascii = base::ASCIIToUTF16(gurl.host());
-      base::string16 utf =
-          url_formatter::IDNToUnicode(gurl.host(), std::string());
+      base::string16 utf = net::IDNToUnicode(gurl.host(), std::string());
       if (ascii != utf)
         query_parser_.ExtractQueryWords(utf, &query_words);
     }