FileAPI code should not rely on or assume specific MountPointProvider types

webkit/fileapi/media/native_media_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 "webkit/fileapi/media/native_media_file_util.h"
 
 #include "webkit/fileapi/file_system_operation_context.h"
+#include "webkit/fileapi/isolated_mount_point_provider.h"
+#include "webkit/fileapi/media/filtering_file_enumerator.h"
 #include "webkit/fileapi/media/media_path_filter.h"
-#include "webkit/fileapi/media/filtering_file_enumerator.h"
 #include "webkit/fileapi/native_file_util.h"
 
 using base::PlatformFile;
 using base::PlatformFileError;
 using base::PlatformFileInfo;
 
 namespace fileapi {
 
+namespace {
+
+MediaPathFilter* GetMediaPathFilter(FileSystemOperationContext* context) {
+  return context->GetUserValue<MediaPathFilter*>(
+          IsolatedMountPointProvider::kMediaPathFilterKey);
+}
+
+}  // namespace
+
 NativeMediaFileUtil::NativeMediaFileUtil() {
 }
 
 PlatformFileError NativeMediaFileUtil::CreateOrOpen(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     int file_flags,
     PlatformFile* file_handle,
     bool* created) {
   // Only called by NaCl, which should not have access to media file systems.
@@ skipping 10 matching lines @@
   return NativeFileUtil::EnsureFileExists(file_path, created);
 }
 
 scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
 NativeMediaFileUtil::CreateFileEnumerator(
     FileSystemOperationContext* context,
     const FileSystemURL& root_url) {
   DCHECK(context);
   return make_scoped_ptr(new FilteringFileEnumerator(
       IsolatedFileUtil::CreateFileEnumerator(context, root_url),
-      context->media_path_filter()))
+      GetMediaPathFilter(context)))
       .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
 }
 
 PlatformFileError NativeMediaFileUtil::Touch(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     const base::Time& last_access_time,
     const base::Time& last_modified_time) {
   base::FilePath file_path;
   PlatformFileError error = GetFilteredLocalFilePathForExistingFileOrDirectory(
@@ skipping 43 matching lines @@
   error = GetLocalFilePath(context, dest_url, &dest_file_path);
   if (error != base::PLATFORM_FILE_OK)
     return error;
   PlatformFileInfo file_info;
   error = NativeFileUtil::GetFileInfo(dest_file_path, &file_info);
   if (error != base::PLATFORM_FILE_OK &&
       error != base::PLATFORM_FILE_ERROR_NOT_FOUND)
     return error;
   if (error == base::PLATFORM_FILE_OK && file_info.is_directory)
     return base::PLATFORM_FILE_ERROR_INVALID_OPERATION;
-  if (!context->media_path_filter()->Match(dest_file_path))
+  if (!GetMediaPathFilter(context)->Match(dest_file_path))
     return base::PLATFORM_FILE_ERROR_SECURITY;
 
   return NativeFileUtil::CopyOrMoveFile(src_file_path, dest_file_path, copy);
 }
 
 PlatformFileError NativeMediaFileUtil::CopyInForeignFile(
     FileSystemOperationContext* context,
     const base::FilePath& src_file_path,
     const FileSystemURL& dest_url) {
   if (src_file_path.empty())
@@ skipping 13 matching lines @@
   base::FilePath file_path;
   PlatformFileError error = GetLocalFilePath(context, url, &file_path);
   if (error != base::PLATFORM_FILE_OK)
     return error;
   PlatformFileInfo file_info;
   error = NativeFileUtil::GetFileInfo(file_path, &file_info);
   if (error != base::PLATFORM_FILE_OK)
     return error;
   if (file_info.is_directory)
     return base::PLATFORM_FILE_ERROR_NOT_A_FILE;
-  if (!context->media_path_filter()->Match(file_path))
+  if (!GetMediaPathFilter(context)->Match(file_path))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   return NativeFileUtil::DeleteFile(file_path);
 }
 
 PlatformFileError NativeMediaFileUtil::GetFileInfo(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     PlatformFileInfo* file_info,
     base::FilePath* platform_path) {
   DCHECK(context);
-  DCHECK(context->media_path_filter());
+  DCHECK(GetMediaPathFilter(context));
   DCHECK(file_info);
   DCHECK(platform_path);
 
   base::PlatformFileError error =
       IsolatedFileUtil::GetFileInfo(context, url, file_info, platform_path);
   if (error != base::PLATFORM_FILE_OK)
     return error;
 
   if (file_info->is_directory ||
-      context->media_path_filter()->Match(*platform_path)) {
+      GetMediaPathFilter(context)->Match(*platform_path)) {
     return base::PLATFORM_FILE_OK;
   }
   return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 }
 
 PlatformFileError NativeMediaFileUtil::GetFilteredLocalFilePath(
     FileSystemOperationContext* context,
     const FileSystemURL& file_system_url,
     base::FilePath* local_file_path) {
   base::FilePath file_path;
   PlatformFileError error =
       IsolatedFileUtil::GetLocalFilePath(context, file_system_url, &file_path);
   if (error != base::PLATFORM_FILE_OK)
     return error;
-  if (!context->media_path_filter()->Match(file_path))
+  if (!GetMediaPathFilter(context)->Match(file_path))
     return base::PLATFORM_FILE_ERROR_SECURITY;
 
   *local_file_path = file_path;
   return base::PLATFORM_FILE_OK;
 }
 
 PlatformFileError
 NativeMediaFileUtil::GetFilteredLocalFilePathForExistingFileOrDirectory(
     FileSystemOperationContext* context,
     const FileSystemURL& file_system_url,
     PlatformFileError failure_error,
     base::FilePath* local_file_path) {
   base::FilePath file_path;
   PlatformFileError error =
       GetLocalFilePath(context, file_system_url, &file_path);
   if (error != base::PLATFORM_FILE_OK)
     return error;
 
   if (!file_util::PathExists(file_path))
     return failure_error;
   PlatformFileInfo file_info;
   if (!file_util::GetFileInfo(file_path, &file_info))
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   if (!file_info.is_directory &&
-      !context->media_path_filter()->Match(file_path)) {
+      !GetMediaPathFilter(context)->Match(file_path)) {
     return failure_error;
   }
 
   *local_file_path = file_path;
   return base::PLATFORM_FILE_OK;
 }
 
 }  // namespace fileapi