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

chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc

 // Copyright 2015 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/browser/supervised_user/supervised_user_bookmarks_handler.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
 
 namespace {
 
 // Keys of relevant managed user settings.
 const char kKeyLink[] = "SupervisedBookmarkLink";
 const char kKeyFolder[] = "SupervisedBookmarkFolder";
 
 // Keys for elements of the bookmarks json tree.
 const char kId[] = "id";
 const char kName[] = "name";
@@ skipping 159 matching lines @@
     for (const Folder& folder : folders_failed) {
       LOG(WARNING) << folder.id << ", " << folder.name << ", "
                    << folder.parent_id;
     }
   }
 }
 
 void SupervisedUserBookmarksHandler::AddLinksToTree() {
   for (const auto& link : links_) {
     scoped_ptr<base::DictionaryValue> node(new base::DictionaryValue);
-    GURL url = url_fixer::FixupURL(link.url, std::string());
+    GURL url = url_formatter::FixupURL(link.url, std::string());
     if (!url.is_valid()) {
       LOG(WARNING) << "Got invalid URL: " << link.url;
       continue;
     }
     node->SetStringWithoutPathExpansion(kUrl, url.spec());
     node->SetStringWithoutPathExpansion(kName, link.name);
     if (!AddNodeToTree(link.parent_id, node.Pass())) {
       LOG(WARNING) << "SupervisedUserBookmarksHandler::AddLinksToTree"
                    << " failed to add link (url,name,parent): "
                    << link.url << ", " << link.name << ", " << link.parent_id;
     }
   }
 }
 
 bool SupervisedUserBookmarksHandler::AddNodeToTree(
     int parent_id,
     scoped_ptr<base::DictionaryValue> node) {
   base::ListValue* parent = FindFolder(root_.get(), parent_id);
   if (!parent)
     return false;
   parent->Append(node.release());
   return true;
 }