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

content/ppapi_plugin/ppapi_thread.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 "content/ppapi_plugin/ppapi_thread.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/stringprintf.h"
 #include "content/common/child_process.h"
 #include "content/common/content_switches.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "content/ppapi_plugin/broker_process_dispatcher.h"
 #include "content/ppapi_plugin/plugin_process_dispatcher.h"
 #include "content/ppapi_plugin/ppapi_webkit_thread.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ppapi/c/dev/ppp_network_state_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/proxy/interface_list.h"
 #include "webkit/plugins/ppapi/webkit_forwarding_impl.h"
 
 #if defined(OS_WIN)
 #include "sandbox/src/sandbox.h"
 #endif
 
 #if defined(OS_WIN)
 extern sandbox::TargetServices* g_target_services;
 #else
 extern void* g_target_services;
@@ skipping 167 matching lines @@
     // Get the InitializeModule function (required).
     ppapi::proxy::Dispatcher::InitModuleFunc init_module =
         reinterpret_cast<ppapi::proxy::Dispatcher::InitModuleFunc>(
             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);
+        &ppapi::proxy::PluginDispatcher::GetInterfaceFromDispatcher);
     if (init_error != PP_OK) {
       LOG(WARNING) << "InitModule failed with error " << init_error;
       return;
     }
   }
 
   library_.Reset(library.Release());
 }
 
 void PpapiThread::OnMsgCreateChannel(base::ProcessHandle host_process_handle,
@@ skipping 69 matching lines @@
 #if defined(OS_POSIX)
   // On POSIX, pass the renderer-side FD.
   handle->socket = base::FileDescriptor(::dup(dispatcher->GetRendererFD()),
                                         true);
 #endif
 
   // From here, the dispatcher will manage its own lifetime according to the
   // lifetime of the attached channel.
   return true;
 }