Move FileEnumerator to its own file, do some refactoring.

chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/thread_test_helper.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_helper_browsertest.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 99 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, DeleteSingleFile) {
   scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper(
       new BrowsingDataLocalStorageHelper(browser()->profile()));
   CreateLocalStorageFilesForTest();
   local_storage_helper->DeleteOrigin(GURL(kOriginOfTestFile0));
   BrowserThread::GetBlockingPool()->FlushForTesting();
 
   // Ensure the file has been deleted.
-  file_util::FileEnumerator file_enumerator(
+  base::FileEnumerator file_enumerator(
       GetLocalStoragePathForTestingProfile(),
       false,
-      file_util::FileEnumerator::FILES);
+      base::FileEnumerator::FILES);
   int num_files = 0;
   for (base::FilePath file_path = file_enumerator.Next();
        !file_path.empty();
        file_path = file_enumerator.Next()) {
     ASSERT_FALSE(base::FilePath(kTestFile0) == file_path.BaseName());
     ++num_files;
   }
   ASSERT_EQ(3, num_files);
 }
 
@@ skipping 36 matching lines @@
       base::Bind(&TestCompletionCallback::callback,
                  base::Unretained(&callback)));
 
   std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo> result =
       callback.result();
 
   ASSERT_EQ(1u, result.size());
   EXPECT_EQ(origin, result.begin()->origin_url);
 }
 }  // namespace