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

components/bookmarks/browser/bookmark_utils.h

 // 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.
 
 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 94 matching lines @@
 
 // If there are no user bookmarks for url, a bookmark is created.
 void AddIfNotBookmarked(BookmarkModel* model,
                         const GURL& url,
                         const base::string16& title);
 
 // Removes all bookmarks for the given |url|.
 void RemoveAllBookmarks(BookmarkModel* model, const GURL& url);
 
 // Truncates an overly-long URL, unescapes it and interprets the characters
-// as UTF-8 (both via net::FormatUrl()), and lower-cases it, returning the
-// result.  |languages| is passed to net::FormatUrl().  |adjustments|, if
-// non-NULL, is set to reflect the transformations the URL spec underwent to
-// become the return value.  If a caller computes offsets (e.g., for the
-// position of matched text) in this cleaned-up string, it can use
-// |adjustments| to calculate the location of these offsets in the original
+// as UTF-8 (both via url_formatter::FormatUrl()), and lower-cases it, returning
+// the result.  |languages| is passed to url_formatter::FormatUrl().
+// |adjustments|, if non-NULL, is set to reflect the transformations the URL
+// spec underwent to become the return value.  If a caller computes offsets
+// (e.g., for the position of matched text) in this cleaned-up string, it can
+// use |adjustments| to calculate the location of these offsets in the original
 // string (via base::OffsetAdjuster::UnadjustOffsets()).  This is useful if
 // later the original string gets formatted in a different way for displaying.
 // In this case, knowing the offsets in the original string will allow them to
 // be properly translated to offsets in the newly-formatted string.
 //
 // The unescaping done by this function makes it possible to match substrings
 // that were originally escaped for navigation; for example, if the user
 // searched for "a&p", the query would be escaped as "a%26p", so without
 // unescaping, an input string of "a&p" would no longer match this URL.  Note
 // that the resulting unescaped URL may not be directly navigable (which is
@@ skipping 22 matching lines @@
 // Returns true if |node| is a descendant of |root|.
 bool IsDescendantOf(const BookmarkNode* node, const BookmarkNode* root);
 
 // Returns true if any node in |list| is a descendant of |root|.
 bool HasDescendantsOf(const std::vector<const BookmarkNode*>& list,
                       const BookmarkNode* root);
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_