Revert 129322 - revert 128949 (and dependent 129252)

webkit/plugins/npapi/plugin_list.h

Index: webkit/plugins/npapi/plugin_list.h
===================================================================
--- webkit/plugins/npapi/plugin_list.h	(revision 129385)
+++ webkit/plugins/npapi/plugin_list.h	(working copy)
@@ -162,9 +162,11 @@
   // If no such group exists, an empty string is returned.
   string16 GetPluginGroupName(const std::string& identifier);
 
-  // Load a specific plugin with full path.
-  void LoadPlugin(const FilePath& filename,
-                  ScopedVector<PluginGroup>* plugin_groups);
+  // Load a specific plugin with full path. Return true iff loading the plug-in
+  // was successful.
+  bool LoadPlugin(const FilePath& filename,
+                  ScopedVector<PluginGroup>* plugin_groups,
+                  webkit::WebPluginInfo* plugin_info);
 
   // The following functions are used to support probing for WebPluginInfo
   // using a different instance of this class.
@@ -186,7 +188,6 @@
 
   // Adds the given WebPluginInfo to its corresponding group, creating it if
   // necessary, and returns the group.
-  // Callers need to protect calls to this method by a lock themselves.
   PluginGroup* AddToPluginGroups(const webkit::WebPluginInfo& web_plugin_info,
                                  ScopedVector<PluginGroup>* plugin_groups);
 
Property changes on: webkit/plugins/npapi/plugin_list.h
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/npapi/plugin_list.h:r3734-4217,4606-5108,5177-5263