Wait a bit for the helper to exit before continuing with removing files.

Also adding a bit of logging for easier diagnostics when we can't remove a folder due to files being in use on uninstall.

TEST=Should improve our chances of being able to uninstall without needing to reboot.
BUG=61609

Review URL: http://codereview.chromium.org/4773002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65814 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 2 deletions

diff --git a/chrome/installer/util/delete_after_reboot_helper.cc b/chrome/installer/util/delete_after_reboot_helper.cc
index e2449e7..075a6a9 100644
--- a/chrome/installer/util/delete_after_reboot_helper.cc
+++ b/chrome/installer/util/delete_after_reboot_helper.cc
@@ -57,7 +57,7 @@ bool ScheduleFileSystemEntityForDeletion(const wchar_t* path) {
   // Check if the file exists, return false if not.
   WIN32_FILE_ATTRIBUTE_DATA attrs = {0};
   if (!::GetFileAttributesEx(path, ::GetFileExInfoStandard, &attrs)) {
-    LOG(ERROR) << path << " for deletion does not exist." << GetLastError();
+    PLOG(WARNING) << path << " does not exist.";
     return false;
   }
 
@@ -68,10 +68,25 @@ bool ScheduleFileSystemEntityForDeletion(const wchar_t* path) {
   }
 
   if (!::MoveFileEx(path, NULL, flags)) {
-    LOG(ERROR) << "Could not schedule " << path << " for deletion.";
+    PLOG(ERROR) << "Could not schedule " << path << " for deletion.";
     return false;
   }
 
+#ifndef NDEBUG
+  // Useful debugging code to track down what files are in use.
+  if (flags & MOVEFILE_REPLACE_EXISTING) {
+    // Attempt to open the file exclusively.
+    HANDLE file = ::CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL,
+        OPEN_EXISTING, 0, NULL);
+    if (file != INVALID_HANDLE_VALUE) {
+      PLOG(INFO) << " file not in use: " << path;
+      ::CloseHandle(file);
+    } else {
+      PLOG(INFO) << " file in use (or not found?): " << path;
+    }
+  }
+#endif
+
   VLOG(1) << "Scheduled for deletion: " << path;
   return true;
 }