| Index: content/renderer/pepper/pepper_file_io_host.cc
|
| ===================================================================
|
| --- content/renderer/pepper/pepper_file_io_host.cc (revision 214423)
|
| +++ content/renderer/pepper/pepper_file_io_host.cc (working copy)
|
| @@ -20,7 +20,6 @@
|
| #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
|
| #include "content/renderer/pepper/ppb_file_ref_impl.h"
|
| #include "content/renderer/pepper/quota_file_io.h"
|
| -#include "content/renderer/pepper/resource_helper.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/c/ppb_file_io.h"
|
| @@ -223,20 +222,17 @@
|
| weak_factory_.GetWeakPtr(),
|
| context->MakeReplyMessageContext());
|
| file_system_dispatcher->OpenFile(
|
| - file_system_url_, flags,
|
| - base::Bind(&DidOpenFileSystemURL, callback),
|
| - base::Bind(&DidFailOpenFileSystemURL, callback));
|
| + file_system_url_, flags,
|
| + base::Bind(&DidOpenFileSystemURL, callback),
|
| + base::Bind(&DidFailOpenFileSystemURL, callback));
|
| } else {
|
| - PepperHelperImpl* helper = static_cast<PepperPluginInstanceImpl*>(
|
| - PepperPluginInstance::Get(pp_instance()))->helper();
|
| - if (file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL || !helper)
|
| + if (file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL)
|
| return PP_ERROR_FAILED;
|
| - if (!helper->AsyncOpenFile(
|
| - file_ref->GetSystemPath(), flags,
|
| - base::Bind(&PepperFileIOHost::ExecutePlatformOpenFileCallback,
|
| - weak_factory_.GetWeakPtr(),
|
| - context->MakeReplyMessageContext())))
|
| - return PP_ERROR_FAILED;
|
| + RenderThreadImpl::current()->AsyncOpenFile(
|
| + file_ref->GetSystemPath(), flags,
|
| + base::Bind(&PepperFileIOHost::ExecutePlatformOpenFileCallback,
|
| + weak_factory_.GetWeakPtr(),
|
| + context->MakeReplyMessageContext()));
|
| }
|
|
|
| state_manager_.SetPendingOperation(FileIOStateManager::OPERATION_EXCLUSIVE);
|
|
|