Move FileEnumerator to its own file, do some refactoring.

net/tools/dump_cache/dump_files.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.
 
 // Performs basic inspection of the disk cache files with minimal disruption
 // to the actual files (they still may change if an error is detected on the
 // files).
 
 #include "net/tools/dump_cache/dump_files.h"
 
 #include <stdio.h>
 
 #include <set>
 #include <string>
 
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
 #include "net/base/file_stream.h"
 #include "net/disk_cache/block_files.h"
 #include "net/disk_cache/disk_format.h"
 #include "net/disk_cache/mapped_file.h"
 #include "net/disk_cache/stats.h"
 #include "net/disk_cache/storage_block.h"
 #include "net/disk_cache/storage_block-inl.h"
 
@@ skipping 305 matching lines @@
 
   return version;
 }
 
 // Dumps the headers of all files.
 int DumpHeaders(const base::FilePath& input_path) {
   base::FilePath index_name(input_path.Append(kIndexName));
   disk_cache::CacheAddr stats_addr = 0;
   DumpIndexHeader(index_name, &stats_addr);
 
-  file_util::FileEnumerator iter(input_path, false,
-                                 file_util::FileEnumerator::FILES,
-                                 FILE_PATH_LITERAL("data_*"));
+  base::FileEnumerator iter(input_path, false,
+                            base::FileEnumerator::FILES,
+                            FILE_PATH_LITERAL("data_*"));
   for (base::FilePath file = iter.Next(); !file.empty(); file = iter.Next())
     DumpBlockHeader(file);
 
   DumpStats(input_path, stats_addr);
   return 0;
 }
 
 // Dumps all entries from the cache.
 int DumpContents(const base::FilePath& input_path) {
   DumpHeaders(input_path);
 
   // We need a message loop, although we really don't run any task.
   MessageLoop loop(MessageLoop::TYPE_IO);
   CacheDumper dumper(input_path);
   if (!dumper.Init())
     return -1;
 
   disk_cache::EntryStore entry;
   while (dumper.GetEntry(&entry)) {
     DumpEntry(entry);
     disk_cache::RankingsNode rankings;
     if (dumper.LoadRankings(entry.rankings_node, &rankings))
       DumpRankings(rankings);
   }
 
   printf("Done.\n");
 
   return 0;
 }