Clear data for origin if no files found

content/browser/plugin_private_storage_helper.cc

 // Copyright 2016 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 "content/browser/plugin_private_storage_helper.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 94 matching lines @@
   const std::string plugin_name_;
   const base::Time begin_;
   const base::Time end_;
   const base::Callback<void(bool, const GURL&)> callback_;
   std::string fsid_;
   int task_count_ = 0;
 
   // Keep track if the data for this origin needs to be deleted due to
   // any file found that has last modified time between |begin_| and |end_|.
   bool delete_this_origin_data_ = false;
+
+  // Keep track if any files exist for this origin.
+  bool files_found_ = false;
 };
 
 void PluginPrivateDataByOriginChecker::CheckFilesOnIOThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(storage::ValidateIsolatedFileSystemId(fsid_));
 
   IncrementTaskCount();
   filesystem_context_->OpenPluginPrivateFileSystem(
       origin_, storage::kFileSystemTypePluginPrivate, fsid_, plugin_name_,
       storage::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT,
@@ skipping 36 matching lines @@
            << ", #files: " << file_list.size();
 
   // Quit if there is an error.
   if (result != base::File::FILE_OK) {
     DLOG(ERROR) << "Unable to read directory for " << origin_ << ":"
                 << plugin_name_;
     DecrementTaskCount();
     return;
   }
 
+  // If there are files found, keep track of it.
+  if (!file_list.empty())
+    files_found_ = true;
+
   // No error, process the files returned. No need to do this if we have
   // already decided to delete all the data for this origin.
   if (!delete_this_origin_data_) {
     storage::AsyncFileUtil* file_util = filesystem_context_->GetAsyncFileUtil(
         storage::kFileSystemTypePluginPrivate);
     for (const auto& file : file_list) {
       DVLOG(3) << __func__ << " file: " << file.name;
       DCHECK(!file.is_directory);  // Nested directories not implemented.
 
       std::unique_ptr<storage::FileSystemOperationContext> operation_context =
@@ skipping 40 matching lines @@
   ++task_count_;
 }
 
 void PluginPrivateDataByOriginChecker::DecrementTaskCount() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK_GT(task_count_, 0);
   --task_count_;
   if (task_count_)
     return;
 
+  // If no files exist for this origin, then we can safely delete it.
+  if (!files_found_)
+    delete_this_origin_data_ = true;
+
   // If there are no more tasks in progress, then run |callback_| on the
   // proper thread.
   filesystem_context_->default_file_task_runner()->PostTask(
       FROM_HERE, base::Bind(callback_, delete_this_origin_data_, origin_));
   delete this;
 }
 
 // Helper for deleting the plugin private data.
 // All of the operations in this class are done on the file task runner.
 class PluginPrivateDataDeletionHelper {
@@ skipping 166 matching lines @@
     origins.insert(storage_origin);
   }
 
   PluginPrivateDataDeletionHelper* helper = new PluginPrivateDataDeletionHelper(
       std::move(filesystem_context), begin, end, callback);
   helper->CheckOriginsOnFileTaskRunner(origins);
   // |helper| will delete itself when all origins have been checked.
 }
 
 }  // namespace content