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

content/renderer/pepper/ppb_audio_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_audio_impl.h"
 
 #include "base/logging.h"
 #include "content/renderer/pepper/common.h"
 #include "content/renderer/pepper/pepper_platform_audio_output.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
-#include "content/renderer/pepper/resource_helper.h"
 #include "content/renderer/render_view_impl.h"
 #include "media/audio/audio_output_controller.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_audio_config_api.h"
 #include "ppapi/thunk/thunk.h"
 
@@ skipping 45 matching lines @@
   // Validate the config and keep a reference to it.
   EnterResourceNoLock<PPB_AudioConfig_API> enter(config, true);
   if (enter.failed())
     return false;
   config_ = config;
 
   if (!callback)
     return false;
   SetCallback(callback, user_data);
 
-  PepperPluginInstanceImpl* instance = ResourceHelper::GetPluginInstance(this);
+  PepperPluginInstance* instance = PepperPluginInstance::Get(pp_instance());
   if (!instance)
     return false;
 
   // When the stream is created, we'll get called back on StreamCreated().
   CHECK(!audio_);
   audio_ = PepperPlatformAudioOutput::Create(
       static_cast<int>(enter.object()->GetSampleRate()),
       static_cast<int>(enter.object()->GetSampleFrameCount()),
       instance->GetRenderView()->GetRoutingID(),
       this);
@@ skipping 29 matching lines @@
 
 int32_t PPB_Audio_Impl::Open(
     PP_Resource config,
     scoped_refptr<TrackedCallback> create_callback) {
   // Validate the config and keep a reference to it.
   EnterResourceNoLock<PPB_AudioConfig_API> enter(config, true);
   if (enter.failed())
     return PP_ERROR_FAILED;
   config_ = config;
 
-  PepperPluginInstanceImpl* instance = ResourceHelper::GetPluginInstance(this);
+  PepperPluginInstance* instance = PepperPluginInstance::Get(pp_instance());
   if (!instance)
     return PP_ERROR_FAILED;
 
   // When the stream is created, we'll get called back on StreamCreated().
   DCHECK(!audio_);
   audio_ = PepperPlatformAudioOutput::Create(
       static_cast<int>(enter.object()->GetSampleRate()),
       static_cast<int>(enter.object()->GetSampleFrameCount()),
       instance->GetRenderView()->GetRoutingID(),
       this);
@@ skipping 19 matching lines @@
 
 void PPB_Audio_Impl::OnSetStreamInfo(
     base::SharedMemoryHandle shared_memory_handle,
     size_t shared_memory_size,
     base::SyncSocket::Handle socket_handle) {
   SetStreamInfo(pp_instance(), shared_memory_handle, shared_memory_size,
                 socket_handle, sample_frame_count_);
 }
 
 }  // namespace content