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

content/renderer/pepper/renderer_ppapi_host_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/renderer_ppapi_host_impl.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/process/process_handle.h"
 #include "content/common/sandbox_util.h"
@@ skipping 104 matching lines @@
   return instance->module()->renderer_ppapi_host();
 }
 
 scoped_ptr< ::ppapi::thunk::ResourceCreationAPI>
 RendererPpapiHostImpl::CreateInProcessResourceCreationAPI(
     PepperPluginInstanceImpl* instance) {
   return scoped_ptr< ::ppapi::thunk::ResourceCreationAPI>(
       new PepperInProcessResourceCreation(this, instance));
 }
 
-PepperBrowserConnection*
-RendererPpapiHostImpl::GetBrowserConnection(PP_Instance instance) const {
-  PepperPluginInstanceImpl* instance_object = GetAndValidateInstance(instance);
-  if (!instance_object)
-    return NULL;
-
-  // Since we're the embedder, we can make assumptions about the helper on
-  // the instance.
-  PepperHelperImpl* helper = instance_object->helper();
-  if (!helper)
-    return NULL;
-
-  return helper->pepper_browser_connection();
-}
-
 PepperPluginInstanceImpl* RendererPpapiHostImpl::GetPluginInstanceImpl(
     PP_Instance instance) const {
   return GetAndValidateInstance(instance);
 }
 
 ppapi::host::PpapiHost* RendererPpapiHostImpl::GetPpapiHost() {
   return ppapi_host_.get();
 }
 
 RenderView* RendererPpapiHostImpl::GetRenderViewForInstance(
@@ skipping 88 matching lines @@
 }
 
 bool RendererPpapiHostImpl::IsRunningInProcess() const {
   return is_running_in_process_;
 }
 
 void RendererPpapiHostImpl::CreateBrowserResourceHost(
     PP_Instance instance,
     const IPC::Message& nested_msg,
     const base::Callback<void(int)>& callback) const {
-  PepperBrowserConnection* browser_connection = GetBrowserConnection(instance);
-  if (browser_connection == NULL) {
+  RenderView* render_view = GetRenderViewForInstance(instance);
+  PepperBrowserConnection* browser_connection =
+      PepperBrowserConnection::Get(render_view);
+  if (!browser_connection) {
     callback.Run(0);
   } else {
     browser_connection->SendBrowserCreate(module_->GetPluginChildId(),
                                           instance,
                                           nested_msg,
                                           callback);
   }
 }
 
 PepperPluginInstanceImpl* RendererPpapiHostImpl::GetAndValidateInstance(
     PP_Instance pp_instance) const {
   PepperPluginInstanceImpl* instance =
       HostGlobals::Get()->GetInstance(pp_instance);
   if (!instance)
     return NULL;
   if (!instance->IsValidInstanceOf(module_))
     return NULL;
   return instance;
 }
 
 }  // namespace content