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

chrome/browser/browsing_data_remover.cc

Index: chrome/browser/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 118520296663f6e7f4aa7d18894bb64ef6e47504..b22438caa5b9d5a7f374c19e8e6e25561785889a 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -773,7 +773,7 @@ void BrowsingDataRemover::OnGotQuotaManagedOrigins(
         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_;
@@ -781,12 +781,13 @@ void BrowsingDataRemover::OnGotQuotaManagedOrigins(
 }
 
 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_;