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

chrome/browser/ui/webui/options/startup_pages_handler.cc

Index: chrome/browser/ui/webui/options/startup_pages_handler.cc
diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc
index c8ebc9aa2fa7fe9e10c47d427d5ee57170dab2ba..6f9946ccbc42755a1c2c8ccc1491eaa6e0f02b10 100644
--- a/chrome/browser/ui/webui/options/startup_pages_handler.cc
+++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc
@@ -21,7 +21,7 @@
 #include "components/omnibox/browser/autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_result.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/web_ui.h"
 
@@ -163,7 +163,7 @@ void StartupPagesHandler::AddStartupPage(const base::ListValue* args) {
   std::string url_string;
   CHECK(args->GetString(0, &url_string));
 
-  GURL url = url_fixer::FixupURL(url_string, std::string());
+  GURL url = url_formatter::FixupURL(url_string, std::string());
   if (!url.is_valid())
     return;
 
@@ -188,7 +188,7 @@ void StartupPagesHandler::EditStartupPage(const base::ListValue* args) {
     return;
   }
 
-  fixed_url = url_fixer::FixupURL(url_string, std::string());
+  fixed_url = url_formatter::FixupURL(url_string, std::string());
   if (!fixed_url.is_empty()) {
     std::vector<GURL> urls = startup_custom_pages_table_model_->GetURLs();
     urls[index] = fixed_url;