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

webkit/plugins/npapi/plugin_list.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 WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 178 matching lines @@
   const std::vector<PluginGroup*>& GetHardcodedPluginGroups() const;
 
   // Clears the internal list of PluginGroups and copies them from the vector.
   void SetPlugins(const std::vector<webkit::WebPluginInfo>& plugins);
 
   void set_will_load_plugins_callback(const base::Closure& callback);
 
   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);
 
   // TODO(ibraaaa): DELETE. http://crbug.com/124396
   // Adds the given WebPluginInfo to its corresponding group, creating it if
   // necessary, and returns the group.
   PluginGroup* AddToPluginGroups(const webkit::WebPluginInfo& web_plugin_info,
                                  ScopedVector<PluginGroup>* plugin_groups);
 
@@ skipping 133 matching lines @@
   // accessed on multiple threads.
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginList);
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_