FileAPI code should not rely on or assume specific MountPointProvider types

webkit/fileapi/isolated_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/isolated_mount_point_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 18 matching lines @@
 #include "webkit/fileapi/media/media_path_filter.h"
 #include "webkit/fileapi/media/native_media_file_util.h"
 #include "webkit/fileapi/native_file_util.h"
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
 #include "webkit/fileapi/media/device_media_async_file_util.h"
 #endif
 
 namespace fileapi {
 
+const char IsolatedMountPointProvider::kMediaPathFilterKey[] =
+    "MediaPathFilterKey";
+const char IsolatedMountPointProvider::kMTPDeviceDelegateURLKey[] =
+    "MTPDeviceDelegateKey";
+
 IsolatedMountPointProvider::IsolatedMountPointProvider(
     const base::FilePath& profile_path)
     : profile_path_(profile_path),
       media_path_filter_(new MediaPathFilter()),
       isolated_file_util_(new AsyncFileUtilAdapter(new IsolatedFileUtil())),
       dragged_file_util_(new AsyncFileUtilAdapter(new DraggedFileUtil())),
       native_media_file_util_(
           new AsyncFileUtilAdapter(new NativeMediaFileUtil())) {
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
   // TODO(kmadhusu): Initialize |device_media_file_util_| in
@@ skipping 125 matching lines @@
   }
   // Access to isolated file systems should be checked using per-filesystem
   // access permission.
   return FILE_PERMISSION_USE_FILESYSTEM_PERMISSION;
 }
 
 FileSystemOperation* IsolatedMountPointProvider::CreateFileSystemOperation(
     const FileSystemURL& url,
     FileSystemContext* context,
     base::PlatformFileError* error_code) const {
-  scoped_ptr<FileSystemOperationContext> operation_context(
-      new FileSystemOperationContext(context));
-  if (url.type() == kFileSystemTypeNativeMedia ||
-      url.type() == kFileSystemTypeDeviceMedia) {
-    operation_context->set_media_path_filter(media_path_filter_.get());
-    operation_context->set_task_runner(
-        context->task_runners()->media_task_runner());
+  if (url.type() != kFileSystemTypeNativeMedia &&
+      url.type() != kFileSystemTypeDeviceMedia) {
+    return new LocalFileSystemOperation(
+        context, make_scoped_ptr(new FileSystemOperationContext(context)));
   }
 
+  // For media filesystems.
+  scoped_ptr<FileSystemOperationContext> operation_context(
+      new FileSystemOperationContext(
+          context, context->task_runners()->media_task_runner()));
+
+  operation_context->SetUserValue(kMediaPathFilterKey,
+                                  media_path_filter_.get());
+
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
-  if (url.type() == kFileSystemTypeDeviceMedia)
-    operation_context->set_mtp_device_delegate_url(url.filesystem_id());
+  if (url.type() == kFileSystemTypeDeviceMedia) {
+    operation_context->SetUserValue(kMTPDeviceDelegateURLKey,
+                                    url.filesystem_id());
+  }
 #endif
 
   return new LocalFileSystemOperation(context, operation_context.Pass());
 }
 
 scoped_ptr<webkit_blob::FileStreamReader>
 IsolatedMountPointProvider::CreateFileStreamReader(
     const FileSystemURL& url,
     int64 offset,
     const base::Time& expected_modification_time,
@@ skipping 20 matching lines @@
 void IsolatedMountPointProvider::DeleteFileSystem(
     const GURL& origin_url,
     FileSystemType type,
     FileSystemContext* context,
     const DeleteFileSystemCallback& callback) {
   NOTREACHED();
   callback.Run(base::PLATFORM_FILE_ERROR_INVALID_OPERATION);
 }
 
 }  // namespace fileapi