[4] Changing content_settings_api to use PluginFinder's async interface

webkit/plugins/npapi/plugin_list.h

Index: webkit/plugins/npapi/plugin_list.h
diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h
index 57204892bb31492462e826a99d4b09828def4a86..3d6ba87ab88af47a9ba56f5a6c43d8c298327ea2 100644
--- a/webkit/plugins/npapi/plugin_list.h
+++ b/webkit/plugins/npapi/plugin_list.h
@@ -196,7 +196,11 @@ class WEBKIT_PLUGINS_EXPORT PluginList {
   virtual ~PluginList();
 
  protected:
-  // TODO(ibraaaa): DELETE and add a different one. http://crbug.com/124396
+  // This constructor is used in unit tests to skip platform-dependent
+  // initialization.
+  PluginList(int dummy);

[Mattias Nissler (ping if slow), 2012/08/27 15:42:09]

Just use the constructor below instead, passing NULL and 0 for the parameters?

[ibraaaa, 2012/08/27 17:34:05]

The Ctor below is going to be deleted anyways and this one will be needed
instead but I guess you are right we don't need to introduce a new one in this
CL.

On 2012/08/27 15:42:09, Mattias Nissler wrote:

+
+  // TODO(ibraaaa): DELETE. http://crbug.com/124396
   // This constructor is used in unit tests to override the platform-dependent
   // real-world plugin group definitions with custom ones.
   PluginList(const PluginGroupDefinition* definitions, size_t num_definitions);