Remove PluginDelegate completely. In a followup I'll rename PepperPluginDelegateImpl to something c…

content/renderer/pepper/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 CONTENT_RENDERER_PEPPER_PLUGIN_MODULE_H_
 #define CONTENT_RENDERER_PEPPER_PLUGIN_MODULE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/native_library.h"
 #include "base/process/process.h"
 #include "content/common/content_export.h"
 #include "content/public/common/pepper_plugin_info.h"
-#include "content/renderer/pepper/plugin_delegate.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 typedef void* NPIdentifier;
 
+class GURL;
+
 namespace base {
 class FilePath;
 }
 
 namespace ppapi {
 class CallbackTracker;
 class WebKitForwarding;
 }  // namespace ppapi
 
 namespace WebKit {
 class WebPluginContainer;
 }  // namespace WebKit
 
 namespace content {
 class HostDispatcherWrapper;
+class PepperPluginDelegateImpl;
 class PepperPluginInstanceImpl;
 class PepperBroker;
-class PluginDelegate;
 class RendererPpapiHostImpl;
 class RenderViewImpl;
 
 // Represents one plugin library loaded into one renderer. This library may
 // have multiple instances.
 //
 // Note: to get from a PP_Instance to a PepperPluginInstance*, use the
 // ResourceTracker.
 class CONTENT_EXPORT PluginModule :
     public base::RefCounted<PluginModule>,
@@ skipping 73 matching lines @@
 
   // Returns the module handle. This may be used before Init() is called (the
   // proxy needs this information to set itself up properly).
   PP_Module pp_module() const { return pp_module_; }
 
   const std::string& name() const { return name_; }
   const base::FilePath& path() const { return path_; }
   const ::ppapi::PpapiPermissions& permissions() const { return permissions_; }
 
   PepperPluginInstanceImpl* CreateInstance(
-      PluginDelegate* delegate,
+      PepperPluginDelegateImpl* delegate,
       RenderViewImpl* render_view,
       WebKit::WebPluginContainer* container,
       const GURL& plugin_url);
 
   // Returns "some" plugin instance associated with this module. This is not
   // guaranteed to be any one in particular. This is normally used to execute
   // callbacks up to the browser layer that are not inherently per-instance,
   // but the delegate lives only on the plugin instance so we need one of them.
   PepperPluginInstanceImpl* GetSomeInstance() const;
 
@@ skipping 94 matching lines @@
   PluginInstanceSet instances_;
 
   PP_Bool (*reserve_instance_id_)(PP_Module, PP_Instance);
 
   DISALLOW_COPY_AND_ASSIGN(PluginModule);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PLUGIN_MODULE_H_