Remove duplication of DieFileDie, and move it to proper location.

chrome/test/ui/ui_test.cc

 // Copyright (c) 2006-2009 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"
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 65 matching lines @@
 
 // By default error dialogs are hidden, which makes debugging failures in the
 // slave process frustrating. By passing this in error dialogs are enabled.
 const wchar_t kEnableErrorDialogs[] = L"enable-errdialogs";
 
 // Uncomment this line to have the spawned process wait for the debugger to
 // attach.  This only works on Windows.  On posix systems, you can set the
 // BROWSER_WRAPPER env variable to wrap the browser process.
 // #define WAIT_FOR_DEBUGGER_ON_OPEN 1
 
-bool UITest::DieFileDie(const FilePath& file, bool recurse) {
-  if (!file_util::PathExists(file))
-    return true;
-
-  // Sometimes Delete fails, so try a few more times.
-  for (int i = 0; i < 25; ++i) {
-    if (file_util::Delete(file, recurse))
-      return true;
-    PlatformThread::Sleep(action_max_timeout_ms() / 25);
-  }
-  return false;
-}
-
 UITest::UITest()
     : testing::Test(),
       launch_arguments_(L""),
       expected_errors_(0),
       expected_crashes_(0),
       homepage_(L"about:blank"),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       process_(0),  // NULL on Windows, 0 PID on POSIX.
       show_window_(false),
@@ skipping 313 matching lines @@
   command_line.AppendArguments(arguments, false);
 
   // Clear user data directory to make sure test environment is consistent
   // We balk on really short (absolute) user_data_dir directory names, because
   // we're worried that they'd accidentally be root or something.
   ASSERT_LT(10, static_cast<int>(user_data_dir_.value().size())) <<
                 "The user data directory name passed into this test was too "
                 "short to delete safely.  Please check the user-data-dir "
                 "argument and try again.";
   if (clear_profile)
-    ASSERT_TRUE(DieFileDie(user_data_dir_, true));
+    ASSERT_TRUE(file_util::DieFileDie(user_data_dir_, true));
 
   if (!template_user_data_.empty()) {
     // Recursively copy the template directory to the user_data_dir.
     ASSERT_TRUE(file_util::CopyRecursiveDirNoCache(
         template_user_data_,
         user_data_dir_.ToWStringHack()));
   }
 
   browser_launch_time_ = TimeTicks::Now();
 
@@ skipping 526 matching lines @@
 }
 
 bool UITest::EvictFileFromSystemCacheWrapper(const FilePath& path) {
   for (int i = 0; i < 10; i++) {
     if (file_util::EvictFileFromSystemCache(path))
       return true;
     PlatformThread::Sleep(sleep_timeout_ms() / 10);
   }
   return false;
 }