Revert r100853, 100851. Win_shared build is broken.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100854 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 10 deletions

diff --git a/ppapi/proxy/ppp_messaging_proxy.cc b/ppapi/proxy/ppp_messaging_proxy.cc
index 390794a..59f4574 100644
--- a/ppapi/proxy/ppp_messaging_proxy.cc
+++ b/ppapi/proxy/ppp_messaging_proxy.cc
@@ -37,19 +37,16 @@ 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() {
@@ -83,7 +80,7 @@ void PPP_Messaging_Proxy::OnMsgHandleMessage(
   // 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