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

chrome/browser/policy/url_blacklist_manager_unittest.cc

Index: chrome/browser/policy/url_blacklist_manager_unittest.cc
diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc
index b00a9a3f35ef5b7f308083b695f2ab8ff48f1454..a21df066ef5e5c75f17321259d03b9206fb1c4b3 100644
--- a/chrome/browser/policy/url_blacklist_manager_unittest.cc
+++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc
@@ -15,7 +15,7 @@
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/policy/policy_helpers.h"
 #include "components/policy/core/common/policy_pref_names.h"
-#include "components/url_formatter/url_fixer.h"
+#include "components/url_fixer/url_fixer.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
@@ -25,7 +25,7 @@
 // TODO(joaodasilva): this file should be moved next to
 // components/policy/core/browser/url_blacklist_manager.(cc|h).
 // However, url_fixer_upper.h can't be included from the component. Rather
-// than having it mocked out, the actual url_formatter::SegmentURL call is used
+// than having it mocked out, the actual url_fixer::SegmentURL call is used
 // to make sure that the parsing of URL filters is correct.
 
 namespace policy {
@@ -34,7 +34,7 @@
 
 // Helper to get the disambiguated SegmentURL() function.
 URLBlacklist::SegmentURLCallback GetSegmentURLCallback() {
-  return url_formatter::SegmentURL;
+  return url_fixer::SegmentURL;
 }
 
 class TestingURLBlacklistManager : public URLBlacklistManager {