Revert 100748 - This patch tries to remove most of the manual registration for Pepper interfaces,...

ppapi/proxy/ppb_broker_proxy.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 "ppapi/proxy/ppb_broker_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/thunk/ppb_broker_api.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::thunk::PPB_Broker_API;
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 base::PlatformFile IntToPlatformFile(int32_t handle) {
 #if defined(OS_WIN)
   return reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle));
 #elif defined(OS_POSIX)
   return handle;
 #else
   #error Not implemented.
 #endif
 }
 
 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
 }
 
+InterfaceProxy* CreateBrokerProxy(Dispatcher* dispatcher,
+                                  const void* target_interface) {
+  return new PPB_Broker_Proxy(dispatcher, target_interface);
+}
+
 }  // namespace
 
 class Broker : public PPB_Broker_API, public Resource {
  public:
   explicit Broker(const HostResource& resource);
   virtual ~Broker();
 
   // Resource overries.
   virtual PPB_Broker_API* AsPPB_Broker_API() OVERRIDE;
 
@@ skipping 82 matching lines @@
   }
 
   if (!current_connect_callback_.func) {
     // The handle might leak if the plugin never calls GetHandle().
     return;
   }
 
   PP_RunAndClearCompletionCallback(&current_connect_callback_, result);
 }
 
-PPB_Broker_Proxy::PPB_Broker_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
+PPB_Broker_Proxy::PPB_Broker_Proxy(Dispatcher* dispatcher,
+                                   const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface) ,
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)){
 }
 
 PPB_Broker_Proxy::~PPB_Broker_Proxy() {
 }
 
 // static
+const InterfaceProxy::Info* PPB_Broker_Proxy::GetInfo() {
+  static const Info info = {
+    ppapi::thunk::GetPPB_Broker_Thunk(),
+    PPB_BROKER_TRUSTED_INTERFACE,
+    INTERFACE_ID_PPB_BROKER,
+    true,
+    &CreateBrokerProxy,
+  };
+  return &info;
+}
+
+// static
 PP_Resource PPB_Broker_Proxy::CreateProxyResource(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBBroker_Create(
       INTERFACE_ID_PPB_BROKER, instance, &result));
   if (result.is_null())
     return 0;
   return (new Broker(result))->GetReference();
 }
 
 bool PPB_Broker_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Broker_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBBroker_Create, OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBBroker_Connect, OnMsgConnect)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBBroker_ConnectComplete,
                         OnMsgConnectComplete)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PPB_Broker_Proxy::OnMsgCreate(PP_Instance instance,
                                    HostResource* result_resource) {
-  thunk::EnterResourceCreation enter(instance);
-  if (enter.succeeded()) {
-    result_resource->SetHostResource(
-        instance,
-        enter.functions()->CreateBroker(instance));
-  }
+  result_resource->SetHostResource(
+      instance,
+      ppb_broker_target()->CreateTrusted(instance));
 }
 
 void PPB_Broker_Proxy::OnMsgConnect(const HostResource& broker) {
   EnterHostFromHostResourceForceCallback<PPB_Broker_API> enter(
       broker, callback_factory_,
       &PPB_Broker_Proxy::ConnectCompleteInHost, broker);
   if (enter.succeeded())
     enter.SetResult(enter.object()->Connect(enter.callback()));
 }
 
@@ skipping 21 matching lines @@
 
 // Callback on the host side.
 // Transfers ownership of the handle to the plugin side. This function must
 // either successfully call the callback or close the handle.
 void PPB_Broker_Proxy::ConnectCompleteInHost(int32_t result,
                                              const HostResource& broker) {
   IPC::PlatformFileForTransit foreign_socket_handle =
       IPC::InvalidPlatformFileForTransit();
   if (result == PP_OK) {
     int32_t socket_handle = PlatformFileToInt(base::kInvalidPlatformFileValue);
-    EnterHostFromHostResource<PPB_Broker_API> enter(broker);
-    if (enter.succeeded())
-      result = enter.object()->GetHandle(&socket_handle);
+    result = ppb_broker_target()->GetHandle(broker.host_resource(),
+                                            &socket_handle);
     DCHECK(result == PP_OK ||
            socket_handle == PlatformFileToInt(base::kInvalidPlatformFileValue));
 
     if (result == PP_OK) {
       foreign_socket_handle =
           dispatcher()->ShareHandleWithRemote(IntToPlatformFile(socket_handle),
                                               true);
       if (foreign_socket_handle == IPC::InvalidPlatformFileForTransit()) {
         result = PP_ERROR_FAILED;
         // Assume the local handle was closed even if the foreign handle could
@@ skipping 12 matching lines @@
       // The easiest way to clean it up is to just put it in an object
       // and then close it. This failure case is not performance critical.
       // The handle could still leak if Send succeeded but the IPC later failed.
       base::SyncSocket temp_socket(
           IPC::PlatformFileForTransitToPlatformFile(foreign_socket_handle));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi