Fix ObfuscatedFileUtil::DeleteDirectoryForOriginAndType() to support plugin private file system.

storage/browser/fileapi/obfuscated_file_util.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 "storage/browser/fileapi/obfuscated_file_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 851 matching lines @@
       origin, type_string, false, &error);
   if (origin_type_path.empty())
     return true;
   if (error != base::File::FILE_ERROR_NOT_FOUND) {
     // TODO(dmikurube): Consider the return value of DestroyDirectoryDatabase.
     // We ignore its error now since 1) it doesn't matter the final result, and
     // 2) it always returns false in Windows because of LevelDB's
     // implementation.
     // Information about failure would be useful for debugging.
     if (!type_string.empty())
       DestroyDirectoryDatabase(origin, type_string);

[nhiroki, 2014/09/19 17:17:19]

Probably we need to make DestroyDirectoryDatabase() callable for plugin private
filesystem to clean up the directory database.

     if (!base::DeleteFile(origin_type_path, true /* recursive */))
       return false;
   }
 
+  if (type_string.empty()) {
+    // The |origin_type_path| is the topmost origin directory if |type_string|
+    // is empty. We should have already deleted that directory.
+    // Now clear the database and we are done.
+    InitOriginDatabase(origin, false);
+    if (origin_database_) {
+      if (!origin_database_->RemovePathForOrigin(
+              storage::GetIdentifierFromOrigin(origin))) {
+        LOG(WARNING) << "Cannot remove path from origin database.";
+      }
+    }
+    return true;
+  }
+
   base::FilePath origin_path = VirtualPath::DirName(origin_type_path);
   DCHECK_EQ(origin_path.value(),
             GetDirectoryForOrigin(origin, false, NULL).value());
 
-  if (!type_string.empty()) {
-    // At this point we are sure we had successfully deleted the origin/type
-    // directory (i.e. we're ready to just return true).
-    // See if we have other directories in this origin directory.
-    for (std::set<std::string>::iterator iter = known_type_strings_.begin();
-         iter != known_type_strings_.end();
-         ++iter) {
-      if (*iter == type_string)
-        continue;
-      if (base::DirectoryExists(origin_path.AppendASCII(*iter))) {
-        // Other type's directory exists; just return true here.
-        return true;
-      }
+  // At this point we are sure we had successfully deleted the origin/type
+  // directory (i.e. we're ready to just return true).
+  // See if we have other directories in this origin directory.
+  for (std::set<std::string>::iterator iter = known_type_strings_.begin();
+       iter != known_type_strings_.end();
+       ++iter) {
+    if (*iter == type_string)
+      continue;
+    if (base::DirectoryExists(origin_path.AppendASCII(*iter))) {
+      // Other type's directory exists; just return true here.
+      return true;
     }
   }
 
   // No other directories seem exist. Try deleting the entire origin directory.
   InitOriginDatabase(origin, false);
   if (origin_database_) {
     origin_database_->RemovePathForOrigin(
         storage::GetIdentifierFromOrigin(origin));
   }
   if (!base::DeleteFile(origin_path, true /* recursive */))
@@ skipping 511 matching lines @@
   }
   return file.Pass();
 }
 
 bool ObfuscatedFileUtil::HasIsolatedStorage(const GURL& origin) {
   return special_storage_policy_.get() &&
       special_storage_policy_->HasIsolatedStorage(origin);
 }
 
 }  // namespace storage