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

chrome/browser/autocomplete/url_index_private_data.cc

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