Move webkit/plugins/ppapi to content/renderer/pepper.

content/common/pepper_plugin_registry.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_COMMON_PEPPER_PLUGIN_REGISTRY_H_
 #define CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_
 
 #include <list>
 #include <map>
 
 #include "content/public/common/pepper_plugin_info.h"
-#include "webkit/plugins/ppapi/plugin_delegate.h"
+
+// TODO(jam): refactor
+#include "content/renderer/pepper/plugin_module.h"
 
 namespace content {
 
 // Constructs a PepperPluginInfo from a WebPluginInfo. Returns false if
 // the operation is not possible, in particular the WebPluginInfo::type
 // must be one of the pepper types.
 bool MakePepperPluginInfo(const WebPluginInfo& webplugin_info,
                           PepperPluginInfo* pepper_info);
 
 // This class holds references to all of the known pepper plugin modules.
 //
 // It keeps two lists. One list of preloaded in-process modules, and one list
 // is a list of all live modules (some of which may be out-of-process and hence
 // not preloaded).
-class PepperPluginRegistry
-    : public webkit::ppapi::PluginDelegate::ModuleLifetime {
+class PepperPluginRegistry {
  public:
   ~PepperPluginRegistry();
 
   static PepperPluginRegistry* GetInstance();
 
   // Computes the list of known pepper plugins.
   //
   // This method is static so that it can be used by the browser process, which
   // has no need to load the pepper plugin modules. It will re-compute the
   // plugin list every time it is called. Generally, code in the registry should
@@ skipping 18 matching lines @@
   // loaded.
   webkit::ppapi::PluginModule* GetLiveModule(const base::FilePath& path);
 
   // Notifies the registry that a new non-preloaded module has been created.
   // This is normally called for out-of-process plugins. Once this is called,
   // the module is available to be returned by GetModule(). The module will
   // automatically unregister itself by calling PluginModuleDestroyed().
   void AddLiveModule(const base::FilePath& path,
                      webkit::ppapi::PluginModule* module);
 
-  // ModuleLifetime implementation.
-  virtual void PluginModuleDead(
-      webkit::ppapi::PluginModule* dead_module) OVERRIDE;
+  void PluginModuleDead(webkit::ppapi::PluginModule* dead_module);
 
  private:
   PepperPluginRegistry();
 
   // All known pepper plugins.
   std::vector<PepperPluginInfo> plugin_list_;
 
   // Plugins that have been preloaded so they can be executed in-process in
   // the renderer (the sandbox prevents on-demand loading).
   typedef std::map<base::FilePath,
@@ skipping 10 matching lines @@
   typedef std::map<base::FilePath, webkit::ppapi::PluginModule*>
       NonOwningModuleMap;
   NonOwningModuleMap live_modules_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPluginRegistry);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_