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

base/test_file_util_win.cc

 // Copyright (c) 2008 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 "base/test_file_util.h"
 
 #include <windows.h>
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/platform_thread.h"
 #include "base/scoped_handle.h"
 
 namespace file_util {
 
 // We could use GetSystemInfo to get the page size, but this serves
 // our purpose fine since 4K is the page size on x86 as well as x64.
 static const ptrdiff_t kPageSize = 4096;
 
+bool DieFileDie(const FilePath& file, bool recurse) {
+  // It turns out that to not induce flakiness a long timeout is needed.
+  const int kTimeoutMs = 10000;
+
+  if (!file_util::PathExists(file))
+    return true;
+
+  // Sometimes Delete fails, so try a few more times. Divide the timeout
+  // into short chunks, so that if a try succeeds, we won't delay the test
+  // for too long.
+  for (int i = 0; i < 25; ++i) {
+    if (file_util::Delete(file, recurse))
+      return true;
+    PlatformThread::Sleep(kTimeoutMs / 25);
+  }
+  return false;
+}
+
 bool EvictFileFromSystemCache(const FilePath& file) {
   // Request exclusive access to the file and overwrite it with no buffering.
   ScopedHandle file_handle(
       CreateFile(file.value().c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL,
                  OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL));
   if (!file_handle)
     return false;
 
   // Get some attributes to restore later.
   BY_HANDLE_FILE_INFORMATION bhi = {0};
@@ skipping 119 matching lines @@
       // matter anyway.
       EvictFileFromSystemCache(FilePath::FromWStringHack(cur_dest_path));
     }
   } while (FindNextFile(fh, &fd));
 
   FindClose(fh);
   return true;
 }
 
 }  // namespace file_util