Move FileEnumerator to its own file, do some refactoring.

chrome/browser/chromeos/contacts/contact_database_unittest.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 "chrome/browser/chromeos/contacts/contact_database.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "chrome/browser/chromeos/contacts/contact_test_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 286 matching lines @@
                metadata_to_save.Pass(),
                true);
   LoadContacts(&loaded_contacts, &loaded_metadata);
   EXPECT_TRUE(loaded_contacts->empty());
 }
 
 // Test that we create a new database when we encounter a corrupted one.
 TEST_F(ContactDatabaseTest, DeleteWhenCorrupt) {
   DestroyDatabase();
   // Overwrite all of the files in the database with a space character.
-  file_util::FileEnumerator enumerator(
-      database_path(), false, file_util::FileEnumerator::FILES);
+  base::FileEnumerator enumerator(
+      database_path(), false, base::FileEnumerator::FILES);
   for (base::FilePath path = enumerator.Next(); !path.empty();
        path = enumerator.Next()) {
     file_util::WriteFile(path, " ", 1);
   }
   CreateDatabase();
 
   // Make sure that the resulting database is usable.
   scoped_ptr<Contact> contact(new Contact);
   InitContact("1", "1", false, contact.get());
   scoped_ptr<ContactPointers> contacts_to_save(new ContactPointers);
@@ skipping 78 matching lines @@
                contact_ids_to_delete.Pass(),
                metadata_to_save.Pass(),
                false);
   LoadContacts(&loaded_contacts, &loaded_metadata);
   EXPECT_EQ(VarContactsToString(1, contact3.get()),
             ContactsToString(*loaded_contacts));
 }
 
 }  // namespace test
 }  // namespace contacts