Componentize URLFixerUpper.

chrome/browser/ui/search_engines/edit_search_engine_controller.cc

Index: chrome/browser/ui/search_engines/edit_search_engine_controller.cc
diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
index c0f254ddb691bf0070a4061519c91cbed839b0f9..d6f66b50b0dd30edd355d3d21fbe3c00fd85a6d7 100644
--- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/common/net/url_fixer_upper.h"
+#include "components/url_fixer/url_fixer.h"
 #include "content/public/browser/user_metrics.h"
 #include "url/gurl.h"
 
@@ -139,7 +139,7 @@ std::string EditSearchEngineController::GetFixedUpURL(
   std::string expanded_url(t_url.url_ref().ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("x"))));
   url::Parsed parts;
-  std::string scheme(URLFixerUpper::SegmentURL(expanded_url, &parts));
+  std::string scheme(url_fixer::SegmentURL(expanded_url, &parts));
   if (!parts.scheme.is_valid())
     url.insert(0, scheme + "://");