Clean up empty directories after install and on errors

chrome/browser/component_updater/component_updater_service.cc

 // Copyright (c) 2012 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/component_updater_service.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 936 matching lines @@
 // |unpacker|. If there is an error this function is in charge of deleting
 // the files created.
 void CrxUpdateService::Install(scoped_ptr<CRXContext> context,
                                const base::FilePath& crx_path) {
   // This function owns the file at |crx_path| and the |context| object.
   ComponentUnpacker unpacker(context->pk_hash,
                              crx_path,
                              context->fingerprint,
                              component_patcher_.get(),
                              context->installer);
-  if (!base::DeleteFile(crx_path, false))
-    NOTREACHED() << crx_path.value();
+  component_updater::DeleteFileAndParentDirectoryIfEmpty(crx_path);

[Sorin Jianu, 2013/12/15 23:12:35]

I will add a unit test to verify this post condition.

[Sorin Jianu, 2013/12/15 23:15:16]

Actually, I can't for now.

+
   // Why unretained? See comment at top of file.
   BrowserThread::PostDelayedTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&CrxUpdateService::DoneInstalling, base::Unretained(this),
                  context->id, unpacker.error(), unpacker.extended_error()),
       base::TimeDelta::FromMilliseconds(config_->StepDelay()));
 }
 
 // Installation has been completed. Adjust the component status and
@@ skipping 123 matching lines @@
 }
 
 // The component update factory. Using the component updater as a singleton
 // is the job of the browser process.
 ComponentUpdateService* ComponentUpdateServiceFactory(
     ComponentUpdateService::Configurator* config) {
   DCHECK(config);
   return new CrxUpdateService(config);
 }