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

webkit/fileapi/sandbox_mount_point_provider.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 "webkit/fileapi/sandbox_mount_point_provider.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 279 matching lines @@
     FileSystemType type,
     const FilePath& old_base_path,
     bool create,
     base::PlatformFileError* error_ptr) {
   DCHECK(error_ptr);
   MigrateIfNeeded(file_util, old_base_path);
 
   FilePath root_path =
       file_util->GetDirectoryForOriginAndType(
           origin_url, type, create, error_ptr);
-  if (root_path.empty()) {
+  if (*error_ptr != base::PLATFORM_FILE_OK) {
     UMA_HISTOGRAM_ENUMERATION(kOpenFileSystemLabel,
                               kCreateDirectoryError,
                               kFileSystemErrorMax);
   } else {
     UMA_HISTOGRAM_ENUMERATION(kOpenFileSystemLabel, kOK, kFileSystemErrorMax);
   }
   // The reference of file_util will be derefed on the FILE thread
   // when the storage of this callback gets deleted regardless of whether
   // this method is called or not.
 }
@@ skipping 68 matching lines @@
 SandboxMountPointProvider::GetFileSystemRootPathOnFileThread(
     const GURL& origin_url, FileSystemType type, const FilePath& unused,
     bool create) {
   if (file_system_options_.is_incognito())
     // TODO(kinuko): return an isolated temporary directory.
     return FilePath();
 
   if (!IsAllowedScheme(origin_url))
     return FilePath();
 
-  MigrateIfNeeded(sandbox_file_util_.get(), old_base_path());
-
-  return sandbox_file_util_->GetDirectoryForOriginAndType(
-      origin_url, type, create);
+  return GetBaseDirectoryForOriginAndType(origin_url, type, create);
 }
 
 bool SandboxMountPointProvider::IsAccessAllowed(const GURL& origin_url,
                                                 FileSystemType type,
                                                 const FilePath& unused) {
   if (type != kFileSystemTypeTemporary && type != kFileSystemTypePersistent)
     return false;
   // We essentially depend on quota to do our access controls, so here
   // we only check if the requested scheme is allowed or not.
   return IsAllowedScheme(origin_url);
@@ skipping 72 matching lines @@
 SandboxMountPointProvider::CreateOriginEnumerator() const {
   MigrateIfNeeded(sandbox_file_util_.get(), old_base_path());
   return new ObfuscatedOriginEnumerator(sandbox_file_util_.get());
 }
 
 FilePath SandboxMountPointProvider::GetBaseDirectoryForOriginAndType(
     const GURL& origin_url, fileapi::FileSystemType type, bool create) const {
 
   MigrateIfNeeded(sandbox_file_util_.get(), old_base_path());
 
-  return sandbox_file_util_->GetDirectoryForOriginAndType(
-      origin_url, type, create);
+  base::PlatformFileError error = base::PLATFORM_FILE_OK;
+  FilePath path = sandbox_file_util_->GetDirectoryForOriginAndType(
+      origin_url, type, create, &error);
+  if (error != base::PLATFORM_FILE_OK)
+    return FilePath();
+  return path;
 }
 
 bool SandboxMountPointProvider::DeleteOriginDataOnFileThread(
     FileSystemContext* file_system_context,
     QuotaManagerProxy* proxy,
     const GURL& origin_url,
     fileapi::FileSystemType type) {
   MigrateIfNeeded(sandbox_file_util_.get(), old_base_path());
 
   int64 usage = GetOriginUsageOnFileThread(file_system_context,
@@ skipping 232 matching lines @@
       break;
     case base::PLATFORM_FILE_ERROR_FAILED:
     default:
       REPORT(kUnknownError);
       break;
   }
 #undef REPORT
 }
 
 }  // namespace fileapi