Relanding this with fixes to the mac dbg builder

webkit/plugins/ppapi/plugin_module.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 123 matching lines @@
   // for in-process plugins), the Reserve function will assume that the ID is
   // usable and will return true.
   void SetReserveInstanceIDCallback(
       PP_Bool (*reserve)(PP_Module, PP_Instance));
   bool ReserveInstanceID(PP_Instance instance);
 
   // These should only be called from the main thread.
   void SetBroker(PluginDelegate::PpapiBroker* broker);
   PluginDelegate::PpapiBroker* GetBroker();
 
-  // Retrieves the forwarding interface used for talking to WebKit.
-  ::ppapi::WebKitForwarding* GetWebKitForwarding();
-
  private:
   // Calls the InitializeModule entrypoint. The entrypoint must have been
   // set and the plugin must not be out of process (we don't maintain
   // entrypoints in that case).
   bool InitializeModule(const EntryPoints& entry_points);
 
   PluginDelegate::ModuleLifetime* lifetime_delegate_;
 
   // Tracker for completion callbacks, used mainly to ensure that all callbacks
   // are properly aborted on module shutdown.
@@ skipping 32 matching lines @@
   const std::string name_;
   const FilePath path_;
 
   // Non-owning pointers to all instances associated with this module. When
   // there are no more instances, this object should be deleted.
   typedef std::set<PluginInstance*> PluginInstanceSet;
   PluginInstanceSet instances_;
 
   PP_Bool (*reserve_instance_id_)(PP_Module, PP_Instance);
 
-  // Lazily created by GetWebKitForwarding.
-  scoped_ptr< ::ppapi::WebKitForwarding> webkit_forwarding_;
-
   DISALLOW_COPY_AND_ASSIGN(PluginModule);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_