Clean up empty directories after install and on errors

chrome/browser/component_updater/background_downloader_win.cc

 // Copyright 2013 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/browser/component_updater/background_downloader_win.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include <functional>
@@ skipping 292 matching lines @@
   HRESULT hr = object.CreateInstance(__uuidof(BackgroundCopyManager));
   if (FAILED(hr)) {
     VLOG(1) << "Failed to instantiate BITS." << std::hex << hr;
     // TODO: add UMA pings.
     return hr;
   }
   *bits_manager = object.Detach();
   return S_OK;
 }
 
+void CleanupJobFiles(IBackgroundCopyJob* job) {
+  std::vector<ScopedComPtr<IBackgroundCopyFile> > files;
+  if (FAILED(GetFilesInJob(job, &files)))
+    return;
+  for (size_t i = 0; i != files.size(); ++i) {
+    base::string16 local_name;
+    HRESULT hr(GetJobFileProperties(files[i], &local_name, NULL, NULL));
+    if (SUCCEEDED(hr))
+      DeleteFileAndParentDirectoryIfEmpty(base::FilePath(local_name));
+  }
+}
+
 }  // namespace
 
 BackgroundDownloader::BackgroundDownloader(
     scoped_ptr<CrxDownloader> successor,
     net::URLRequestContextGetter* context_getter,
     scoped_refptr<base::SequencedTaskRunner> task_runner,
     const DownloadCallback& download_callback)
     : CrxDownloader(successor.Pass(), download_callback),
       context_getter_(context_getter),
       task_runner_(task_runner),
@@ skipping 114 matching lines @@
     BG_FILE_PROGRESS progress = {0};
     HRESULT hr = GetJobFileProperties(files[0], &local_name, NULL, &progress);
     if (SUCCEEDED(hr)) {
       DCHECK(progress.Completed);
       response = base::FilePath(local_name);
     } else {
       error = hr;
     }
   }
 
-  if (FAILED(error) && job_)
+  if (FAILED(error) && job_) {
     job_->Cancel();
+    CleanupJobFiles(job_);
+  }
 
   job_ = NULL;
 
   // Consider the url handled if it has been successfully downloaded or a
   // 5xx has been received.
   const bool is_handled = SUCCEEDED(error) ||
                           IsHttpServerError(GetHttpStatusFromBitsError(error));
 
   Result result;
   result.error = error;
@@ skipping 192 matching lines @@
   std::vector<ScopedComPtr<IBackgroundCopyJob> > jobs;
   HRESULT hr = FindBitsJobIf(
       std::bind2nd(JobCreationOlderThanDays(), kPurgeStaleJobsAfterDays),
       bits_manager,
       &jobs);
   if (FAILED(hr))
     return hr;
 
   for (size_t i = 0; i != jobs.size(); ++i) {
     jobs[i]->Cancel();
+    CleanupJobFiles(jobs[i]);
   }
 
   return S_OK;
 }
 
 }  // namespace component_updater