Correctly schedule empty parent directories for deletion when Chrome Frame is...

chrome/installer/util/delete_after_reboot_helper.cc

 // Copyright (c) 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.
 //
 // This file defines helper methods used to schedule files for deletion
 // on next reboot. The code here is heavily borrowed and simplified from
 //  http://code.google.com/p/omaha/source/browse/trunk/common/file.cc and
 //  http://code.google.com/p/omaha/source/browse/trunk/common/utils.cc
 //
 // This implementation really is not fast, so do not use it where that will
@@ skipping 36 matching lines @@
     if (*s == L'.' && s > dir_name && *(s - 1) == L'.') {
       return false;
     }
     if (*s == L':') {
       ok = false;
     }
   }
   return ok;
 }
 
+}  // end namespace
+
 // Must only be called for regular files or directories that will be empty.
 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();
     return false;
   }
 
   DWORD flags = MOVEFILE_DELAY_UNTIL_REBOOT;
   if (!file_util::DirectoryExists(FilePath::FromWStringHack(path))) {
     // This flag valid only for files
     flags |= MOVEFILE_REPLACE_EXISTING;
   }
 
   if (!::MoveFileEx(path, NULL, flags)) {
     LOG(ERROR) << "Could not schedule " << path << " for deletion.";
     return false;
   }
 
   LOG(INFO) << "Scheduled for deletion: " << path;
   return true;
 }
-}  // end namespace
 
 bool ScheduleDirectoryForDeletion(const wchar_t* dir_name) {
   if (!IsSafeDirectoryNameForDeletion(dir_name)) {
     LOG(ERROR) << "Unsafe directory name for deletion: " << dir_name;
     return false;
   }
 
   // Make sure the directory exists (it is ok if it doesn't)
   DWORD dir_attributes = ::GetFileAttributes(dir_name);
   if (dir_attributes == INVALID_FILE_ATTRIBUTES) {
@@ skipping 275 matching lines @@
       return session_manager_key.WriteValue(kPendingFileRenameOps, &buffer[0],
                                             buffer.size(), REG_MULTI_SZ);
     } else {
       return false;
     }
   } else {
     // We have only the trailing NULL string. Don't bother writing that.
     return session_manager_key.DeleteValue(kPendingFileRenameOps);
   }
 }