Remove webkit::ppapi::Resource.

content/renderer/pepper_plugin_delegate_impl.cc

 // Copyright (c) 2011 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_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <queue>
 
 #include "base/bind.h"
@@ skipping 52 matching lines @@
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/ppapi/file_path.h"
 #include "webkit/plugins/ppapi/ppb_file_io_impl.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_broker_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using WebKit::WebView;
 
 namespace {
 
 int32_t PlatformFileToInt(base::PlatformFile handle) {
 #if defined(OS_WIN)
   return static_cast<int32_t>(reinterpret_cast<intptr_t>(handle));
 #elif defined(OS_POSIX)
@@ skipping 536 matching lines @@
   base::SyncSocket::Handle plugin_handle = base::kInvalidPlatformFileValue;
   int32_t result = PP_OK;
 
   base::SyncSocket* sockets[2] = {0};
   if (base::SyncSocket::CreatePair(sockets)) {
     // The socket objects will be deleted when this function exits, closing the
     // handles. Any uses of the socket must duplicate them.
     scoped_ptr<base::SyncSocket> broker_socket(sockets[0]);
     scoped_ptr<base::SyncSocket> plugin_socket(sockets[1]);
 
-    result = dispatcher_->SendHandleToBroker(client->instance()->pp_instance(),
+    result = dispatcher_->SendHandleToBroker(client->pp_instance(),
                                              broker_socket->handle());
 
     // If the broker has its pipe handle, duplicate the plugin's handle.
     // Otherwise, the plugin's handle will be automatically closed.
     if (result == PP_OK)
       plugin_handle = DuplicateHandle(plugin_socket->handle());
   } else {
     result = PP_ERROR_FAILED;
   }
 
@@ skipping 315 matching lines @@
 // If a broker has not already been created for this plugin, creates one.
 webkit::ppapi::PluginDelegate::PpapiBroker*
 PepperPluginDelegateImpl::ConnectToPpapiBroker(
     webkit::ppapi::PPB_Broker_Impl* client) {
   CHECK(client);
 
   // If a broker needs to be created, this will ensure it does not get deleted
   // before Connect() adds a reference.
   scoped_refptr<PpapiBrokerImpl> broker_impl;
 
-  webkit::ppapi::PluginModule* plugin_module = client->instance()->module();
+  webkit::ppapi::PluginModule* plugin_module =
+      webkit::ppapi::ResourceHelper::GetPluginModule(client);
   PpapiBroker* broker = plugin_module->GetBroker();
   if (!broker) {
     broker_impl = CreatePpapiBroker(plugin_module);
     if (!broker_impl.get())
       return NULL;
     broker = broker_impl;
   }
 
   // Adds a reference, ensuring not deleted when broker_impl goes out of scope.
   broker->Connect(client);
@@ skipping 499 matching lines @@
 
 ppapi::Preferences PepperPluginDelegateImpl::GetPreferences() {
   return ppapi::Preferences(render_view_->webkit_preferences());
 }
 
 void PepperPluginDelegateImpl::PublishInitialPolicy(
     scoped_refptr<webkit::ppapi::PluginInstance> instance,
     const std::string& policy) {
   instance->HandlePolicyUpdate(policy);
 }