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

chrome/utility/importer/bookmarks_file_importer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/utility/importer/bookmarks_file_importer.h"
 
 #include "base/bind.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/importer_bridge.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/utility/importer/bookmark_html_reader.h"
 #include "components/favicon_base/favicon_usage_data.h"
-#include "components/url_formatter/url_fixer.h"
+#include "components/url_fixer/url_fixer.h"
 #include "content/public/common/url_constants.h"
 
 namespace {
 
 bool IsImporterCancelled(BookmarksFileImporter* importer) {
   return importer->cancelled();
 }
 
 }  // namespace
 
@@ skipping 18 matching lines @@
     return true;
 
   // If |url| starts with chrome:// or about:, check if it's one of the URLs
   // that we support.
   if (url.SchemeIs(content::kChromeUIScheme) ||
       url.SchemeIs(url::kAboutScheme)) {
     if (url.host() == chrome::kChromeUIUberHost ||
         url.host() == chrome::kChromeUIAboutHost)
       return true;
 
-    GURL fixed_url(url_formatter::FixupURL(url.spec(), std::string()));
+    GURL fixed_url(url_fixer::FixupURL(url.spec(), std::string()));
     for (size_t i = 0; i < chrome::kNumberOfChromeHostURLs; ++i) {
       if (fixed_url.DomainIs(chrome::kChromeHostURLs[i]))
         return true;
     }
 
     for (int i = 0; i < chrome::kNumberOfChromeDebugURLs; ++i) {
       if (fixed_url == GURL(chrome::kChromeDebugURLs[i]))
         return true;
     }
 
@@ skipping 42 matching lines @@
     bridge->AddBookmarks(bookmarks, first_folder_name);
   }
   if (!search_engines.empty())
     bridge->SetKeywords(search_engines, false);
   if (!favicons.empty())
     bridge->SetFavicons(favicons);
 
   bridge->NotifyItemEnded(importer::FAVORITES);
   bridge->NotifyEnded();
 }