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

chrome/browser/ui/bookmarks/bookmark_utils.h

 // Copyright (c) 2012 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 CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_
 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_
 
 #include <vector>
 
 #include "base/strings/string16.h"
@@ skipping 77 matching lines @@
 void GetURLAndTitleToBookmark(content::WebContents* web_contents,
                               GURL* url,
                               base::string16* title);
 
 // Toggles whether the bookmark bar is shown only on the new tab page or on
 // all tabs. This is a preference modifier, not a visual modifier.
 void ToggleBookmarkBarWhenVisible(content::BrowserContext* browser_context);
 
 // Returns a formatted version of |url| appropriate to display to a user with
 // the given |prefs|, which may be NULL.  When re-parsing this URL, clients
-// should call url_fixer::FixupURL().
+// should call url_formatter::FixupURL().
 base::string16 FormatBookmarkURLForDisplay(const GURL& url,
                                            const PrefService* prefs);
 
 // Returns whether the Apps shortcut is enabled. If true, then the visibility
 // of the Apps shortcut should be controllable via an item in the bookmark
 // context menu.
 bool IsAppsShortcutEnabled(Profile* profile,
                            chrome::HostDesktopType host_desktop_type);
 
 // Returns true if the Apps shortcut should be displayed in the bookmark bar.
@@ skipping 33 matching lines @@
 // |data| are an ancestor of |drop_parent| and one of the nodes isn't already
 // a child of |drop_parent| at |index|.
 bool IsValidBookmarkDropLocation(Profile* profile,
                                  const bookmarks::BookmarkNodeData& data,
                                  const bookmarks::BookmarkNode* drop_parent,
                                  int index);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_