Add a way to implement GetInterface in the broker.

content/ppapi_plugin/ppapi_thread.cc

 // Copyright (c) 2012 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 "content/ppapi_plugin/ppapi_thread.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/process_util.h"
@@ skipping 43 matching lines @@
   WebKit::initialize(webkit_platform_support_.get());
 }
 
 PpapiThread::~PpapiThread() {
   ppapi::proxy::PluginGlobals::Get()->set_plugin_proxy_delegate(NULL);
 
   if (!library_.is_valid())
     return;
 
   // The ShutdownModule/ShutdownBroker function is optional.
-  ppapi::proxy::ProxyChannel::ShutdownModuleFunc shutdown_function =
+  PP_ShutdownModule_Func shutdown_function =
       is_broker_ ?
-      reinterpret_cast<ppapi::proxy::ProxyChannel::ShutdownModuleFunc>(
+      reinterpret_cast<PP_ShutdownModule_Func>(
           library_.GetFunctionPointer("PPP_ShutdownBroker")) :
-      reinterpret_cast<ppapi::proxy::ProxyChannel::ShutdownModuleFunc>(
+      reinterpret_cast<PP_ShutdownModule_Func>(
           library_.GetFunctionPointer("PPP_ShutdownModule"));
   if (shutdown_function)
     shutdown_function();
   WebKit::shutdown();
 }
 
 // The "regular" ChildThread implements this function and does some standard
 // dispatching, then uses the message router. We don't actually need any of
 // this so this function just overrides that one.
 //
@@ skipping 120 matching lines @@
       LOG(WARNING) << "InitBroker failed with error " << init_error;
       return;
     }
     if (!connect_instance_func_) {
       LOG(WARNING) << "InitBroker did not provide PP_ConnectInstance_Func";
       return;
     }
   } else {
     // Get the GetInterface function (required).
     get_plugin_interface_ =
-        reinterpret_cast<ppapi::proxy::Dispatcher::GetInterfaceFunc>(
+        reinterpret_cast<PP_GetInterface_Func>(
             library.GetFunctionPointer("PPP_GetInterface"));
     if (!get_plugin_interface_) {
       LOG(WARNING) << "No PPP_GetInterface in plugin library";
       return;
     }
 
 #if defined(OS_MACOSX)
     // We need to do this after getting |PPP_GetInterface()| (or presumably
     // doing something nontrivial with the library), else the sandbox
     // intercedes.
     if (!content::InitializeSandbox()) {
       LOG(WARNING) << "Failed to initialize sandbox";
     }
 #endif
 
     // Get the InitializeModule function (required).
-    ppapi::proxy::Dispatcher::InitModuleFunc init_module =
-        reinterpret_cast<ppapi::proxy::Dispatcher::InitModuleFunc>(
+    PP_InitializeModule_Func init_module =
+        reinterpret_cast<PP_InitializeModule_Func>(
             library.GetFunctionPointer("PPP_InitializeModule"));
     if (!init_module) {
       LOG(WARNING) << "No PPP_InitializeModule in plugin library";
       return;
     }
     int32_t init_error = init_module(
         local_pp_module_,
         &ppapi::proxy::PluginDispatcher::GetBrowserInterface);
     if (init_error != PP_OK) {
       LOG(WARNING) << "InitModule failed with error " << init_error;
@@ skipping 85 matching lines @@
 
   // From here, the dispatcher will manage its own lifetime according to the
   // lifetime of the attached channel.
   return true;
 }
 
 void PpapiThread::SavePluginName(const FilePath& path) {
   ppapi::proxy::PluginGlobals::Get()->set_plugin_name(
       path.BaseName().AsUTF8Unsafe());
 }