[merge to m54] Prevent interpretating userinfo as url scheme when editing bookmarks

chrome/browser/ui/bookmarks/bookmark_utils.h

Index: chrome/browser/ui/bookmarks/bookmark_utils.h
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.h b/chrome/browser/ui/bookmarks/bookmark_utils.h
index 1cb09cef183356be49180e9274bddca49ebeaf03..1a5bf29d3599fce20c987c7c997a9c80aa331c7a 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.h
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.h
@@ -53,9 +53,8 @@ void GetURLAndTitleToBookmark(content::WebContents* web_contents,
 // 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_formatter::FixupURL().
+// Returns a formatted version of |url| appropriate to display to a user.
+// When re-parsing this URL, clients should call url_formatter::FixupURL().
 base::string16 FormatBookmarkURLForDisplay(const GURL& url);
 
 // Returns whether the Apps shortcut is enabled. If true, then the visibility