FileAPI code should not rely on or assume specific MountPointProvider types

webkit/fileapi/media/device_media_async_file_util.cc

 // Copyright (c) 2013 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/device_media_async_file_util.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/single_thread_task_runner.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/isolated_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/mtp_device_async_delegate.h"
 #include "webkit/fileapi/media/mtp_device_map_service.h"
 
 namespace fileapi {
 
 namespace {
 
 const base::FilePath::CharType kDeviceMediaAsyncFileUtilTempDir[] =
     FILE_PATH_LITERAL("DeviceMediaFileSystem");
 
 // Returns true if the current thread is IO thread.
 bool IsOnIOThread(FileSystemOperationContext* context) {
   return context->file_system_context()->task_runners()->
       io_task_runner()->RunsTasksOnCurrentThread();
 }
 
 // Called on the IO thread.
 MTPDeviceAsyncDelegate* GetMTPDeviceDelegate(
     FileSystemOperationContext* context) {
   DCHECK(IsOnIOThread(context));
   return MTPDeviceMapService::GetInstance()->GetMTPDeviceAsyncDelegate(
-      context->mtp_device_delegate_url());
+      context->GetUserValue<std::string>(
+          IsolatedMountPointProvider::kMTPDeviceDelegateURLKey));
 }
 
 // Called on a blocking pool thread to create a snapshot file to hold the
 // contents of |device_file_path|. The snapshot file is created in
 // "profile_path/kDeviceMediaAsyncFileUtilTempDir" directory. If the snapshot
 // file is created successfully, |snapshot_file_path| will be a non-empty file
 // path. In case of failure, the |snapshot_file_path| will be an empty file
 // path.
 void CreateSnapshotFileOnBlockingPool(
     const base::FilePath& device_file_path,
@@ skipping 195 matching lines @@
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     const CreateSnapshotFileCallback& callback) {
   DCHECK(IsOnIOThread(context));
   MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(context);
   if (!delegate) {
     OnCreateSnapshotFileError(callback, base::PLATFORM_FILE_ERROR_NOT_FOUND);
     return true;
   }
   base::FilePath* snapshot_file_path = new base::FilePath;
-  return context->file_system_context()->task_runners()->media_task_runner()->
-      PostTaskAndReply(
+  return context->task_runner()->PostTaskAndReply(
           FROM_HERE,
           base::Bind(&CreateSnapshotFileOnBlockingPool,
                      url.path(),
                      profile_path_,
                      base::Unretained(snapshot_file_path)),
           base::Bind(&DeviceMediaAsyncFileUtil::OnSnapshotFileCreatedRunTask,
                      weak_ptr_factory_.GetWeakPtr(),
                      context,
                      callback,
                      url.path(),
@@ skipping 74 matching lines @@
       *snapshot_file_path,
       base::Bind(&DeviceMediaAsyncFileUtil::OnDidCreateSnapshotFile,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback),
       base::Bind(&DeviceMediaAsyncFileUtil::OnCreateSnapshotFileError,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
 }  // namespace fileapi