Revert 198820 "Move FileEnumerator to its own file, do some refa..."

trunk/src/chrome/test/ui/ui_test.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/test/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/environment.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/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/test/test_file_util.h"
@@ skipping 410 matching lines @@
   }
 
   return source_history_file;
 }
 
 int UITestBase::GetCrashCount() const {
   base::FilePath crash_dump_path;
   PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_path);
 
   int files_found = 0;
-  base::FileEnumerator en(crash_dump_path, false, base::FileEnumerator::FILES);
+  file_util::FileEnumerator en(crash_dump_path, false,
+                               file_util::FileEnumerator::FILES);
   while (!en.Next().empty()) {
-    if (en.GetInfo().GetLastModifiedTime() > test_start_time_)
+    file_util::FileEnumerator::FindInfo info;
+    if (file_util::FileEnumerator::GetLastModifiedTime(info) > test_start_time_)
       files_found++;
   }
 
 #if defined(OS_WIN)
   // Each crash creates two dump files on Windows.
   return files_found / 2;
 #else
   return files_found;
-#endif
+ #endif
 }
 
 std::string UITestBase::CheckErrorsAndCrashes() const {
   // Make sure that we didn't encounter any assertion failures
   logging::AssertionList assertions;
   logging::GetFatalAssertions(&assertions);
 
   // If there were errors, get all the error strings for display.
   std::wstring failures =
       L"The following error(s) occurred in the application during this test:";
@@ skipping 241 matching lines @@
   ASSERT_TRUE(session_end_completed);
 
   // Make sure session restore says we didn't crash.
   scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences());
   ASSERT_TRUE(profile_prefs.get());
   std::string exit_type;
   ASSERT_TRUE(profile_prefs->GetString(prefs::kSessionExitedCleanly,
                                         &exit_type));
   EXPECT_EQ(ProfileImpl::kPrefExitTypeNormal, exit_type);
 }