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

chrome/browser/policy/managed_bookmarks_policy_handler.cc

 // Copyright 2014 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/policy/managed_bookmarks_policy_handler.h"
 
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/bookmarks/managed/managed_bookmarks_tracker.h"
 #include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
 #include "policy/policy_constants.h"
 #include "url/gurl.h"
 
 using bookmarks::ManagedBookmarksTracker;
 
 namespace policy {
 
 ManagedBookmarksPolicyHandler::ManagedBookmarksPolicyHandler(
     Schema chrome_schema)
     : SchemaValidatingPolicyHandler(
@@ skipping 40 matching lines @@
       continue;
     }
 
     if (children) {
       // Ignore the URL if this bookmark has child nodes.
       dict->Remove(ManagedBookmarksTracker::kUrl, NULL);
       FilterBookmarks(children);
     } else {
       // Make sure the URL is valid before passing a bookmark to the pref.
       dict->Remove(ManagedBookmarksTracker::kChildren, NULL);
-      GURL gurl = url_fixer::FixupURL(url, "");
+      GURL gurl = url_formatter::FixupURL(url, std::string());
       if (!gurl.is_valid()) {
         it = list->Erase(it, NULL);
         continue;
       }
       dict->SetString(ManagedBookmarksTracker::kUrl, gurl.spec());
     }
 
     ++it;
   }
 }
 
 }  // namespace policy