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

ppapi/proxy/ppb_testing_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_testing_proxy.h"
 
 #include "base/message_loop.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
@@ skipping 57 matching lines @@
 }
 
 const PPB_Testing_Dev testing_interface = {
   &ReadImageData,
   &RunMessageLoop,
   &QuitMessageLoop,
   &GetLiveObjectsForInstance,
   &IsOutOfProcess
 };
 
-InterfaceProxy* CreateTestingProxy(Dispatcher* dispatcher) {
-  return new PPB_Testing_Proxy(dispatcher);
+InterfaceProxy* CreateTestingProxy(Dispatcher* dispatcher,
+                                   const void* target_interface) {
+  return new PPB_Testing_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
-PPB_Testing_Proxy::PPB_Testing_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
-      ppb_testing_impl_(NULL) {
-  if (!dispatcher->IsPlugin()) {
-    ppb_testing_impl_ = static_cast<const PPB_Testing_Dev*>(
-        dispatcher->local_get_interface()(PPB_TESTING_DEV_INTERFACE));
-  }
+PPB_Testing_Proxy::PPB_Testing_Proxy(Dispatcher* dispatcher,
+                                     const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPB_Testing_Proxy::~PPB_Testing_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPB_Testing_Proxy::GetInfo() {
   static const Info info = {
     &testing_interface,
     PPB_TESTING_DEV_INTERFACE,
@@ skipping 14 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PPB_Testing_Proxy::OnMsgReadImageData(
     const HostResource& device_context_2d,
     const HostResource& image,
     const PP_Point& top_left,
     PP_Bool* result) {
-  *result = ppb_testing_impl_->ReadImageData(
+  *result = ppb_testing_target()->ReadImageData(
       device_context_2d.host_resource(), image.host_resource(), &top_left);
 }
 
 void PPB_Testing_Proxy::OnMsgRunMessageLoop(PP_Instance instance) {
-  ppb_testing_impl_->RunMessageLoop(instance);
+  ppb_testing_target()->RunMessageLoop(instance);
 }
 
 void PPB_Testing_Proxy::OnMsgQuitMessageLoop(PP_Instance instance) {
-  ppb_testing_impl_->QuitMessageLoop(instance);
+  ppb_testing_target()->QuitMessageLoop(instance);
 }
 
 void PPB_Testing_Proxy::OnMsgGetLiveObjectsForInstance(PP_Instance instance,
                                                        uint32_t* result) {
-  *result = ppb_testing_impl_->GetLiveObjectsForInstance(instance);
+  *result = ppb_testing_target()->GetLiveObjectsForInstance(instance);
 }
 
 }  // namespace proxy
 }  // namespace ppapi