Move more file_util functions to base namespace.

chrome/browser/media_galleries/media_folder_finder_unittest.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 "chrome/browser/media_galleries/media_folder_finder.h"
 
 #include <set>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 101 matching lines @@
       default:
         NOTREACHED();
         return;
     }
     if (big)
       filesize *= 100000;
 
     for (size_t i = 0; i < count; ++i) {
       base::FilePath test_file(parent_dir.AppendASCII("dummy." + extension));
       int uniquifier =
-          file_util::GetUniquePathNumber(test_file,
-                                         base::FilePath::StringType());
+          base::GetUniquePathNumber(test_file, base::FilePath::StringType());
       if (uniquifier > 0) {
         test_file = test_file.InsertBeforeExtensionASCII(
             base::StringPrintf(" (%d)", uniquifier));
         filesize += uniquifier;
       }
 
       std::string dummy_data;
       dummy_data.resize(filesize);
 
       int bytes_written =
@@ skipping 269 matching lines @@
 
   // |fake_home_dir| and its ancestors do not show up in results.
   expected_results.erase(fake_dir());
   expected_results.erase(fake_home_dir);
 
   CreateMediaFolderFinder(folders, true, expected_results);
   StartScan();
   RunLoopUntilReceivedCallback();
   DeleteMediaFolderFinder();
 }