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

ppapi/proxy/ppb_core_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_core_proxy.h"
 
 #include <stdlib.h>  // For malloc
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 57 matching lines @@
 
 const PPB_Core core_interface = {
   &AddRefResource,
   &ReleaseResource,
   &GetTime,
   &GetTimeTicks,
   &CallOnMainThread,
   &IsMainThread
 };
 
+InterfaceProxy* CreateCoreProxy(Dispatcher* dispatcher,
+                                const void* target_interface) {
+  return new PPB_Core_Proxy(dispatcher, target_interface);
+}
+
 }  // namespace
 
-PPB_Core_Proxy::PPB_Core_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
-      ppb_core_impl_(NULL) {
-  if (!dispatcher->IsPlugin()) {
-    ppb_core_impl_ = static_cast<const PPB_Core*>(
-        dispatcher->local_get_interface()(PPB_CORE_INTERFACE));
-  }
+PPB_Core_Proxy::PPB_Core_Proxy(Dispatcher* dispatcher,
+                               const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPB_Core_Proxy::~PPB_Core_Proxy() {
 }
 
 // static
-const PPB_Core* PPB_Core_Proxy::GetPPB_Core_Interface() {
-  return &core_interface;
+const InterfaceProxy::Info* PPB_Core_Proxy::GetInfo() {
+  static const Info info = {
+    &core_interface,
+    PPB_CORE_INTERFACE,
+    INTERFACE_ID_PPB_CORE,
+    false,
+    &CreateCoreProxy,
+  };
+  return &info;
 }
 
 bool PPB_Core_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Core_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBCore_AddRefResource,
                         OnMsgAddRefResource)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBCore_ReleaseResource,
                         OnMsgReleaseResource)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   // TODO(brettw) handle bad messages!
   return handled;
 }
 
 void PPB_Core_Proxy::OnMsgAddRefResource(const HostResource& resource) {
-  ppb_core_impl_->AddRefResource(resource.host_resource());
+  ppb_core_target()->AddRefResource(resource.host_resource());
 }
 
 void PPB_Core_Proxy::OnMsgReleaseResource(const HostResource& resource) {
-  ppb_core_impl_->ReleaseResource(resource.host_resource());
+  ppb_core_target()->ReleaseResource(resource.host_resource());
 }
 
 }  // namespace proxy
 }  // namespace ppapi