Componentize URLFixerUpper.

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 795d25499e865fa43c3871093e27c1a4eefd41d7..cb29ae7a0217760c9b153fdb28b53783aaccbf84 100644
--- a/chrome/browser/policy/url_blacklist_manager_unittest.cc
+++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc
@@ -13,8 +13,8 @@
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/browser/policy/policy_helpers.h"
-#include "chrome/common/net/url_fixer_upper.h"
 #include "components/policy/core/common/policy_pref_names.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"
@@ -27,7 +27,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 URLFixerUpper::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 {
@@ -36,7 +36,7 @@ namespace {
 
 // Helper to get the disambiguated SegmentURL() function.
 URLBlacklist::SegmentURLCallback GetSegmentURLCallback() {
-  return URLFixerUpper::SegmentURL;
+  return url_fixer::SegmentURL;
 }
 
 class TestingURLBlacklistManager : public URLBlacklistManager {