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

ppapi/proxy/ppp_messaging_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/ppp_messaging_proxy.h"
 
 #include <algorithm>
 
 #include "ppapi/c/ppp_messaging.h"
 #include "ppapi/proxy/host_dispatcher.h"
@@ skipping 19 matching lines @@
   dispatcher->Send(new PpapiMsg_PPPMessaging_HandleMessage(
       INTERFACE_ID_PPP_MESSAGING,
       instance,
       SerializedVarSendInput(dispatcher, message_data)));
 }
 
 static const PPP_Messaging messaging_interface = {
   &HandleMessage
 };
 
-InterfaceProxy* CreateMessagingProxy(Dispatcher* dispatcher) {
-  return new PPP_Messaging_Proxy(dispatcher);
+InterfaceProxy* CreateMessagingProxy(Dispatcher* dispatcher,
+                                     const void* target_interface) {
+  return new PPP_Messaging_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
-PPP_Messaging_Proxy::PPP_Messaging_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
-      ppp_messaging_impl_(NULL) {
-  if (dispatcher->IsPlugin()) {
-    ppp_messaging_impl_ = static_cast<const PPP_Messaging*>(
-        dispatcher->local_get_interface()(PPP_MESSAGING_INTERFACE));
-  }
+PPP_Messaging_Proxy::PPP_Messaging_Proxy(Dispatcher* dispatcher,
+                                         const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPP_Messaging_Proxy::~PPP_Messaging_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPP_Messaging_Proxy::GetInfo() {
   static const Info info = {
     &messaging_interface,
     PPP_MESSAGING_INTERFACE,
@@ skipping 13 matching lines @@
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PPP_Messaging_Proxy::OnMsgHandleMessage(
     PP_Instance instance, SerializedVarReceiveInput message_data) {
   PP_Var received_var(message_data.Get(dispatcher()));
   // SerializedVarReceiveInput will decrement the reference count, but we want
   // to give the recipient a reference.
   PluginResourceTracker::GetInstance()->var_tracker().AddRefVar(received_var);
-  ppp_messaging_impl_->HandleMessage(instance, received_var);
+  ppp_messaging_target()->HandleMessage(instance, received_var);
 }
 
 }  // namespace proxy
 }  // namespace ppapi