Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_broker_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 "webkit/plugins/ppapi/ppb_broker_impl.h"
 
 #include "base/logging.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 
 using ::ppapi::thunk::PPB_Broker_API;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 // TODO(ddorwin): Put conversion functions in a common place and/or add an
 // invalid value to sync_socket.h.
 int32_t PlatformFileToInt(base::PlatformFile handle) {
 #if defined(OS_WIN)
   return static_cast<int32_t>(reinterpret_cast<intptr_t>(handle));
 #elif defined(OS_POSIX)
   return handle;
 #else
   #error Not implemented.
 #endif
 }
 
 }  // namespace
 
 // PPB_Broker_Impl ------------------------------------------------------
 
-PPB_Broker_Impl::PPB_Broker_Impl(PluginInstance* instance)
+PPB_Broker_Impl::PPB_Broker_Impl(PP_Instance instance)
     : Resource(instance),
       broker_(NULL),
       connect_callback_(),
       pipe_handle_(PlatformFileToInt(base::kInvalidPlatformFileValue)) {
 }
 
 PPB_Broker_Impl::~PPB_Broker_Impl() {
   if (broker_) {
     broker_->Disconnect(this);
     broker_ = NULL;
@@ skipping 13 matching lines @@
     return PP_ERROR_BADARGUMENT;
   }
 
   // TODO(ddorwin): Return PP_ERROR_FAILED if plugin is in-process.
 
   if (broker_) {
     // May only be called once.
     return PP_ERROR_FAILED;
   }
 
+  PluginInstance* instance = ResourceHelper::GetPluginInstance(this);

[viettrungluu, 2011/08/22 23:19:47]

Maybe we should use plugin_instance for PluginInstances?

+
   // The callback must be populated now in case we are connected to the broker
   // and BrokerConnected is called before ConnectToPpapiBroker returns.
   // Because it must be created now, it must be aborted and cleared if
   // ConnectToPpapiBroker fails.
   connect_callback_ = new TrackedCompletionCallback(
-      instance()->module()->GetCallbackTracker(), pp_resource(),
+      instance->module()->GetCallbackTracker(), pp_resource(),
       connect_callback);
 
-  broker_ = instance()->delegate()->ConnectToPpapiBroker(this);
+  broker_ = instance->delegate()->ConnectToPpapiBroker(this);
   if (!broker_) {
     scoped_refptr<TrackedCompletionCallback> callback;
     callback.swap(connect_callback_);
     callback->Abort();
     return PP_ERROR_FAILED;
   }
 
   return PP_OK_COMPLETIONPENDING;
 }
 
@@ skipping 16 matching lines @@
   // Synchronous calls are not supported.
   DCHECK(connect_callback_.get() && !connect_callback_->completed());
 
   scoped_refptr<TrackedCompletionCallback> callback;
   callback.swap(connect_callback_);
   callback->Run(result);  // Will complete abortively if necessary.
 }
 
 }  // namespace ppapi
 }  // namespace webkit