Clean up enhanced_bookmark_utils.h/cc

components/enhanced_bookmarks/enhanced_bookmark_utils.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 "components/enhanced_bookmarks/enhanced_bookmark_utils.h"
 
 #include "base/i18n/string_compare.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 namespace enhanced_bookmarks {
 
 // Comparator used to sort bookmarks. No folders are allowed.
 class BookmarkNameComparator : public std::binary_function<const BookmarkNode*,

[Lei Zhang, 2015/04/07 21:59:29]

Now BookmarkNameComparator is dead code. Care to do a follow up CL? You can
remove #include "base/i18n/string_compare.h" as well.

                                                            const BookmarkNode*,
                                                            bool> {
  public:
   explicit BookmarkNameComparator(icu::Collator* collator)
       : collator_(collator) {}
 
   // Returns true if |n1| preceeds |n2|.
   bool operator()(const BookmarkNode* n1, const BookmarkNode* n2) {
     DCHECK(!n1->is_folder());
     DCHECK(!n2->is_folder());
     if (!collator_)
       return n1->GetTitle() < n2->GetTitle();
     return base::i18n::CompareString16WithCollator(
                collator_, n1->GetTitle(), n2->GetTitle()) == UCOL_LESS;
   }
 
  private:
   icu::Collator* collator_;
 };
 
-void SortBookmarksByName(std::vector<const BookmarkNode*>& nodes) {
-  UErrorCode error = U_ZERO_ERROR;
-  scoped_ptr<icu::Collator> collator(icu::Collator::createInstance(error));
-  if (U_FAILURE(error))
-    collator.reset(NULL);
-  std::sort(nodes.begin(), nodes.end(), BookmarkNameComparator(collator.get()));
-}
-
 std::vector<const BookmarkNode*> PrimaryPermanentNodes(BookmarkModel* model) {
   DCHECK(model->loaded());
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(model->mobile_node());
   nodes.push_back(model->bookmark_bar_node());
   nodes.push_back(model->other_node());
   return nodes;
 }
 
 std::vector<const BookmarkNode*> RootLevelFolders(BookmarkModel* model) {
@@ skipping 33 matching lines @@
   const BookmarkNode* top = node;
   while (top &&
          std::find(root_folders.begin(), root_folders.end(), top) ==
              root_folders.end()) {
     top = top->parent();
   }
   return top;
 }
 
 }  // namespace enhanced_bookmarks