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

ppapi/proxy/ppp_video_decoder_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_video_decoder_proxy.h"
 
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_video_decoder_proxy.h"
@@ skipping 60 matching lines @@
 }
 
 static const PPP_VideoDecoder_Dev video_decoder_interface = {
   &ProvidePictureBuffers,
   &DismissPictureBuffer,
   &PictureReady,
   &EndOfStream,
   &NotifyError
 };
 
-InterfaceProxy* CreateVideoDecoderPPPProxy(Dispatcher* dispatcher) {
-  return new PPP_VideoDecoder_Proxy(dispatcher);
+InterfaceProxy* CreateVideoDecoderPPPProxy(
+    Dispatcher* dispatcher, const void* target_interface) {
+  return new PPP_VideoDecoder_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
-PPP_VideoDecoder_Proxy::PPP_VideoDecoder_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
-      ppp_video_decoder_impl_(NULL) {
-  if (dispatcher->IsPlugin()) {
-    ppp_video_decoder_impl_ = static_cast<const PPP_VideoDecoder_Dev*>(
-        dispatcher->local_get_interface()(PPP_VIDEODECODER_DEV_INTERFACE));
-  }
+PPP_VideoDecoder_Proxy::PPP_VideoDecoder_Proxy(
+    Dispatcher* dispatcher, const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPP_VideoDecoder_Proxy::~PPP_VideoDecoder_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPP_VideoDecoder_Proxy::GetInfo() {
   static const Info info = {
     &video_decoder_interface,
     PPP_VIDEODECODER_DEV_INTERFACE,
@@ skipping 21 matching lines @@
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   return handled;
 }
 
 void PPP_VideoDecoder_Proxy::OnMsgProvidePictureBuffers(
     const HostResource& decoder, uint32_t req_num_of_bufs,
     const PP_Size& dimensions) {
   PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
-  ppp_video_decoder_impl_->ProvidePictureBuffers(
+  ppp_video_decoder_target()->ProvidePictureBuffers(
       decoder.instance(), plugin_decoder, req_num_of_bufs, dimensions);
 }
 
 void PPP_VideoDecoder_Proxy::OnMsgDismissPictureBuffer(
     const HostResource& decoder, int32_t picture_id) {
   PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
-  ppp_video_decoder_impl_->DismissPictureBuffer(
+  ppp_video_decoder_target()->DismissPictureBuffer(
       decoder.instance(), plugin_decoder, picture_id);
 }
 
 void PPP_VideoDecoder_Proxy::OnMsgPictureReady(
     const HostResource& decoder, const PP_Picture_Dev& picture) {
   PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
-  ppp_video_decoder_impl_->PictureReady(
+  ppp_video_decoder_target()->PictureReady(
       decoder.instance(), plugin_decoder, picture);
 }
 
 void PPP_VideoDecoder_Proxy::OnMsgNotifyEndOfStream(
     const HostResource& decoder) {
   PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
-  ppp_video_decoder_impl_->EndOfStream(decoder.instance(),
+  ppp_video_decoder_target()->EndOfStream(decoder.instance(),
                                           plugin_decoder);
 }
 
 void PPP_VideoDecoder_Proxy::OnMsgNotifyError(
     const HostResource& decoder, PP_VideoDecodeError_Dev error) {
   PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
-  ppp_video_decoder_impl_->NotifyError(
+  ppp_video_decoder_target()->NotifyError(
       decoder.instance(), plugin_decoder, error);
 }
 
 }  // namespace proxy
 }  // namespace ppapi