Removed the dependency of PepperPluginRegistry on Pepper proxy.

content/common/pepper_plugin_registry.h

 // 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.
 
 #ifndef CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_
 #define CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_
 #pragma once
 
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "content/common/content_export.h"
-#include "ppapi/proxy/proxy_channel.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/webplugininfo.h"
 
 struct CONTENT_EXPORT PepperPluginInfo {
   PepperPluginInfo();
   ~PepperPluginInfo();
 
   webkit::WebPluginInfo ToWebPluginInfo() const;
 
@@ skipping 22 matching lines @@
 // must be one of the pepper types.
 bool MakePepperPluginInfo(const webkit::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,
-      public ppapi::proxy::ProxyChannel::Delegate {
+    : public webkit::ppapi::PluginDelegate::ModuleLifetime {
  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 24 matching lines @@
   // the module is available to be returned by GetModule(). The module will
   // automatically unregister itself by calling PluginModuleDestroyed().
   void AddLiveModule(const FilePath& path, webkit::ppapi::PluginModule* module);
 
   // ModuleLifetime implementation.
   virtual void PluginModuleDead(webkit::ppapi::PluginModule* dead_module);
 
  private:
   PepperPluginRegistry();
 
-  // ProxyChannel::Delegate implementation.
-  virtual base::MessageLoopProxy* GetIPCMessageLoop();
-  virtual base::WaitableEvent* GetShutdownEvent();
-
   // 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<FilePath, scoped_refptr<webkit::ppapi::PluginModule> >
       OwningModuleMap;
   OwningModuleMap preloaded_modules_;
 
   // A list of non-owning pointers to all currently-live plugin modules. This
   // includes both preloaded ones in preloaded_modules_, and out-of-process
   // modules whose lifetime is managed externally. This will contain only
   // non-crashed modules. If an out-of-process module crashes, it may
   // continue as long as there are WebKit references to it, but it will not
   // appear in this list.
   typedef std::map<FilePath, webkit::ppapi::PluginModule*> NonOwningModuleMap;
   NonOwningModuleMap live_modules_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPluginRegistry);
 };
 
 #endif  // CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_