Revert r108760 / reland r108744, r108753 w/ fix

content/public/common/content_client.h

Index: content/public/common/content_client.h
diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h
index 7386ef78f7e7621083ce0a07ceff77af084762bb..840e37067174e82b814263e737edb65b7504e61c 100644
--- a/content/public/common/content_client.h
+++ b/content/public/common/content_client.h
@@ -29,6 +29,12 @@ namespace sandbox {
 class TargetPolicy;
 }
 
+namespace webkit {
+namespace npapi {
+class PluginList;
+}
+}
+
 namespace content {
 
 class ContentBrowserClient;
@@ -79,6 +85,10 @@ class CONTENT_EXPORT ContentClient {
   virtual void AddPepperPlugins(
       std::vector<content::PepperPluginInfo>* plugins) = 0;
 
+  // Gives the embedder a chance to register its own internal NPAPI plugins.
+  virtual void AddNPAPIPlugins(
+      webkit::npapi::PluginList* plugin_list) = 0;
+
   // Returns whether the given message should be allowed to be sent from a
   // swapped out renderer.
   virtual bool CanSendWhileSwappedOut(const IPC::Message* msg) = 0;