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

ppapi/proxy/ppb_flash_clipboard_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_flash_clipboard_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash_clipboard.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ skipping 70 matching lines @@
   // Assume success, since it allows us to avoid a sync IPC.
   return PP_OK;
 }
 
 const PPB_Flash_Clipboard flash_clipboard_interface = {
   &IsFormatAvailable,
   &ReadPlainText,
   &WritePlainText
 };
 
-InterfaceProxy* CreateFlashClipboardProxy(Dispatcher* dispatcher) {
-  return new PPB_Flash_Clipboard_Proxy(dispatcher);
+InterfaceProxy* CreateFlashClipboardProxy(Dispatcher* dispatcher,
+                                          const void* target_interface) {
+  return new PPB_Flash_Clipboard_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
-PPB_Flash_Clipboard_Proxy::PPB_Flash_Clipboard_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
-      ppb_flash_clipboard_impl_(NULL) {
-  if (!dispatcher->IsPlugin()) {
-    ppb_flash_clipboard_impl_ = static_cast<const PPB_Flash_Clipboard*>(
-        dispatcher->local_get_interface()(PPB_FLASH_CLIPBOARD_INTERFACE));
-  }
+PPB_Flash_Clipboard_Proxy::PPB_Flash_Clipboard_Proxy(
+    Dispatcher* dispatcher, const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPB_Flash_Clipboard_Proxy::~PPB_Flash_Clipboard_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPB_Flash_Clipboard_Proxy::GetInfo() {
   static const Info info = {
     &flash_clipboard_interface,
     PPB_FLASH_CLIPBOARD_INTERFACE,
@@ skipping 16 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PPB_Flash_Clipboard_Proxy::OnMsgIsFormatAvailable(
     PP_Instance instance_id,
     int clipboard_type,
     int format,
     bool* result) {
-  *result = PP_ToBool(ppb_flash_clipboard_impl_->IsFormatAvailable(
+  *result = PP_ToBool(ppb_flash_clipboard_target()->IsFormatAvailable(
       instance_id,
       static_cast<PP_Flash_Clipboard_Type>(clipboard_type),
       static_cast<PP_Flash_Clipboard_Format>(format)));
 }
 
 void PPB_Flash_Clipboard_Proxy::OnMsgReadPlainText(
     PP_Instance instance_id,
     int clipboard_type,
     SerializedVarReturnValue result) {
   result.Return(dispatcher(),
-                ppb_flash_clipboard_impl_->ReadPlainText(
+                ppb_flash_clipboard_target()->ReadPlainText(
                     instance_id,
                     static_cast<PP_Flash_Clipboard_Type>(clipboard_type)));
 }
 
 void PPB_Flash_Clipboard_Proxy::OnMsgWritePlainText(
     PP_Instance instance_id,
     int clipboard_type,
     SerializedVarReceiveInput text) {
-  int32_t result = ppb_flash_clipboard_impl_->WritePlainText(
+  int32_t result = ppb_flash_clipboard_target()->WritePlainText(
       instance_id,
       static_cast<PP_Flash_Clipboard_Type>(clipboard_type),
       text.Get(dispatcher()));
   LOG_IF(WARNING, result != PP_OK) << "Write to clipboard failed unexpectedly.";
 }
 
 }  // namespace proxy
 }  // namespace ppapi