A few more cleanups to the pepper code. Dispatch IPCs in the sockets implementations directly by ha…

content/renderer/pepper/ppb_file_ref_impl.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 "content/renderer/pepper/ppb_file_ref_impl.h"
 
 #include "base/files/file_util_proxy.h"
 #include "base/platform_file.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/fileapi/file_system_dispatcher.h"
 #include "content/renderer/pepper/common.h"
 #include "content/renderer/pepper/pepper_file_system_host.h"
 #include "content/renderer/pepper/pepper_helper_impl.h"
-#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/plugin_module.h"
 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
-#include "content/renderer/pepper/resource_helper.h"
 #include "content/renderer/render_thread_impl.h"
 #include "net/base/escape.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/shared_impl/file_type_conversion.h"
 #include "ppapi/shared_impl/time_conversion.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_file_system_api.h"
 #include "url/gurl.h"
@@ skipping 200 matching lines @@
       external_file_system_path_(external_file_path) {
 }
 
 PPB_FileRef_Impl::~PPB_FileRef_Impl() {
 }
 
 // static
 PPB_FileRef_Impl* PPB_FileRef_Impl::CreateInternal(PP_Instance instance,
                                                    PP_Resource pp_file_system,
                                                    const std::string& path) {
-  PepperPluginInstanceImpl* plugin_instance =
-      ResourceHelper::PPInstanceToPluginInstance(instance);
-  if (!plugin_instance || !plugin_instance->helper())
-    return 0;
-
   ppapi::host::ResourceHost* host = GetResourceHostInternal(
       instance, pp_file_system);
   if (!host)
     return 0;
 
   PepperFileSystemHost* fs_host = host->AsPepperFileSystemHost();
   if (!fs_host)
     return 0;
 
   PP_FileSystemType type = fs_host->GetType();
@@ skipping 193 matching lines @@
 
 int32_t PPB_FileRef_Impl::Query(PP_FileInfo* info,
                                 scoped_refptr<TrackedCallback> callback) {
   NOTREACHED();
   return PP_ERROR_FAILED;
 }
 
 int32_t PPB_FileRef_Impl::QueryInHost(
     linked_ptr<PP_FileInfo> info,
     scoped_refptr<TrackedCallback> callback) {
-  scoped_refptr<PepperPluginInstanceImpl> plugin_instance =
-      ResourceHelper::GetPluginInstance(this);
-  if (!plugin_instance.get())
-    return PP_ERROR_FAILED;
-
   if (!file_system_) {
     // External file system
     // We have to do something totally different for external file systems.
 
     // TODO(teravest): Use the SequencedWorkerPool instead.
     scoped_refptr<base::TaskRunner> task_runner =
         RenderThreadImpl::current()->GetFileThreadMessageLoopProxy();
-    if (!plugin_instance->helper()->AsyncOpenFile(
-            GetSystemPath(),
-            base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ,
-            base::Bind(&QueryCallback, task_runner, info, callback)))
-      return PP_ERROR_FAILED;
+    RenderThreadImpl::current()->AsyncOpenFile(
+        GetSystemPath(),
+        base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ,
+        base::Bind(&QueryCallback, task_runner, info, callback));
   } else {
     // Non-external file system
     if (!HasValidFileSystem())
       return PP_ERROR_NOACCESS;
 
     PP_FileSystemType file_system_type = GetResourceHost()->
         AsPepperFileSystemHost()->GetType();
     FileSystemDispatcher* file_system_dispatcher =
         ChildThread::current()->file_system_dispatcher();
     file_system_dispatcher->ReadMetadata(
@@ skipping 37 matching lines @@
 ppapi::host::ResourceHost* PPB_FileRef_Impl::GetResourceHostInternal(
     PP_Instance instance, PP_Resource resource) {
   const ppapi::host::PpapiHost* ppapi_host =
       RendererPpapiHost::GetForPPInstance(instance)->GetPpapiHost();
   if (!resource || !ppapi_host)
     return NULL;
   return ppapi_host->GetResourceHost(resource);
 }
 
 }  // namespace content