Drop |languages| from {Format,Elide}Url* and IDNToUnicode

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 67 matching lines @@
 void GetMostRecentlyAddedEntries(BookmarkModel* model,
                                  size_t count,
                                  std::vector<const BookmarkNode*>* nodes);
 
 // Returns true if |n1| was added more recently than |n2|.
 bool MoreRecentlyAdded(const BookmarkNode* n1, const BookmarkNode* n2);
 
 // Returns up to |max_count| bookmarks from |model| whose url or title contain
 // the text |query.word_phrase_query| and exactly match |query.url| and
 // |query.title|, for all of the preceding fields that are not NULL.
-// |languages| is user's accept-language setting to decode IDN.
 void GetBookmarksMatchingProperties(BookmarkModel* model,
                                     const QueryFields& query,
                                     size_t max_count,
-                                    const std::string& languages,
                                     std::vector<const BookmarkNode*>* nodes);
 
 // Register user preferences for Bookmarks Bar.
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
 // Register managed bookmarks preferences.
 void RegisterManagedBookmarksPrefs(PrefRegistrySimple* registry);
 
 // Returns the parent for newly created folders/bookmarks. If |selection| has
 // one element and it is a folder, |selection[0]| is returned, otherwise
 // |parent| is returned. If |index| is non-null it is set to the index newly
 // added nodes should be added at.
 const BookmarkNode* GetParentForNewNodes(
     const BookmarkNode* parent,
     const std::vector<const BookmarkNode*>& selection,
     int* index);
 
 // Deletes the bookmark folders for the given list of |ids|.
 void DeleteBookmarkFolders(BookmarkModel* model,
                            const std::vector<int64_t>& ids);
 
 // 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 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.
+// Truncates an overly-long URL, unescapes it and interprets the
+// characters as UTF-8 (both via url_formatter::FormatUrl()), and
+// lower-cases it, returning the result. |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
 // why it was escaped to begin with).
 base::string16 CleanUpUrlForMatching(
     const GURL& gurl,
-    const std::string& languages,
     base::OffsetAdjuster::Adjustments* adjustments);
 
 // Returns the lower-cased title, possibly truncated if the original title
 // is overly-long.
 base::string16 CleanUpTitleForMatching(const base::string16& title);
 
 // Returns true if all the |nodes| can be edited by the user,
 // as determined by BookmarkClient::CanBeEditedByUser().
 bool CanAllBeEditedByUser(BookmarkClient* client,
                           const std::vector<const BookmarkNode*>& nodes);
 
 // Returns true if |url| has a bookmark in the |model| that can be edited
 // by the user.
 bool IsBookmarkedByUser(BookmarkModel* model, const GURL& url);
 
 // Returns the node with |id|, or NULL if there is no node with |id|.
 const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64_t id);
 
 // 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_