Don't keep file system directories around if they contain unrelated files.

chrome/browser/browsing_data_remover.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/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 767 matching lines @@
     if (!BrowsingDataHelper::DoesOriginMatchMask(origin->GetOrigin(),
                                                  origin_set_mask_,
                                                  special_storage_policy_))
       continue;
 
     ++quota_managed_origins_to_delete_count_;
     quota_manager_->DeleteOriginData(
         origin->GetOrigin(), type,
         BrowsingDataRemover::GenerateQuotaClientMask(remove_mask_),
         base::Bind(&BrowsingDataRemover::OnQuotaManagedOriginDeletion,
-                   base::Unretained(this)));
+                   base::Unretained(this), origin->GetOrigin(), type));
   }
 
   --quota_managed_storage_types_to_delete_count_;
   CheckQuotaManagedDataDeletionStatus();
 }
 
 void BrowsingDataRemover::OnQuotaManagedOriginDeletion(
+    const GURL& origin,
+    quota::StorageType type,
     quota::QuotaStatusCode status) {
   DCHECK_GT(quota_managed_origins_to_delete_count_, 0);
   if (status != quota::kQuotaStatusOk) {
-    // TODO(mkwst): We should add the GURL to StatusCallback; this is a pretty
-    // worthless error message otherwise.
-    DLOG(ERROR) << "Couldn't remove origin. Status: " << status;
+    DLOG(ERROR) << "Couldn't remove data of type " << type << " for origin "
+                << origin << ". Status: " << status;
   }
 
   --quota_managed_origins_to_delete_count_;
   CheckQuotaManagedDataDeletionStatus();
 }
 
 void BrowsingDataRemover::CheckQuotaManagedDataDeletionStatus() {
   if (quota_managed_storage_types_to_delete_count_ != 0 ||
       quota_managed_origins_to_delete_count_ != 0) {
     return;
@@ skipping 63 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts,
                  base::Unretained(this)));
 }
 
 void BrowsingDataRemover::OnClearedServerBoundCerts() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_server_bound_certs_ = false;
   NotifyAndDeleteIfDone();
 }