Move file_util_icu to base::i18n namespace

net/base/directory_lister.cc

 // 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.
 
 #include "net/base/directory_lister.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 23 matching lines @@
     return true;
   if (IsDotDot(b.info.GetName()))
     return false;
 
   // Directories before regular files.
   bool a_is_directory = a.info.IsDirectory();
   bool b_is_directory = b.info.IsDirectory();
   if (a_is_directory != b_is_directory)
     return a_is_directory;
 
-  return file_util::LocaleAwareCompareFilenames(a.info.GetName(),
-                                                b.info.GetName());
+  return base::i18n::LocaleAwareCompareFilenames(a.info.GetName(),
+                                                 b.info.GetName());
 }
 
 bool CompareDate(const DirectoryLister::DirectoryListerData& a,
                  const DirectoryLister::DirectoryListerData& b) {
   // Parent directory before all else.
   if (IsDotDot(a.info.GetName()))
     return true;
   if (IsDotDot(b.info.GetName()))
     return false;
 
   // Directories before regular files.
   bool a_is_directory = a.info.IsDirectory();
   bool b_is_directory = b.info.IsDirectory();
   if (a_is_directory != b_is_directory)
     return a_is_directory;
   return a.info.GetLastModifiedTime() > b.info.GetLastModifiedTime();
 }
 
 // Comparator for sorting find result by paths. This uses the locale-aware
 // comparison function on the filenames for sorting in the user's locale.
 // Static.
 bool CompareFullPath(const DirectoryLister::DirectoryListerData& a,
                      const DirectoryLister::DirectoryListerData& b) {
-  return file_util::LocaleAwareCompareFilenames(a.path, b.path);
+  return base::i18n::LocaleAwareCompareFilenames(a.path, b.path);
 }
 
 void SortData(std::vector<DirectoryLister::DirectoryListerData>* data,
               DirectoryLister::SortType sort_type) {
   // Sort the results. See the TODO below (this sort should be removed and we
   // should do it from JS).
   if (sort_type == DirectoryLister::DATE)
     std::sort(data->begin(), data->end(), CompareDate);
   else if (sort_type == DirectoryLister::FULL_PATH)
     std::sort(data->begin(), data->end(), CompareFullPath);
@@ skipping 125 matching lines @@
 
 void DirectoryLister::OnReceivedData(const DirectoryListerData& data) {
   delegate_->OnListFile(data);
 }
 
 void DirectoryLister::OnDone(int error) {
   delegate_->OnListDone(error);
 }
 
 }  // namespace net