Remove the two years old code to enable the nacl plugin once if it's disabled. This was added to de…

content/browser/plugin_loader_posix.cc

Index: content/browser/plugin_loader_posix.cc
===================================================================
--- content/browser/plugin_loader_posix.cc	(revision 212045)
+++ content/browser/plugin_loader_posix.cc	(working copy)
@@ -75,11 +75,11 @@
   next_load_index_ = 0;
 
   canonical_list_.clear();
-  PluginServiceImpl::GetInstance()->GetPluginList()->GetPluginPathsToLoad(
+  webkit::npapi::PluginList::Singleton()->GetPluginPathsToLoad(

[Bernhard Bauer, 2013/07/17 15:59:52]

Is this related to this change?

[jam, 2013/07/17 16:02:16]

yep, I removed PluginService::GetPluginList since it was only there for
PluginPrefs

[Bernhard Bauer, 2013/07/17 16:06:33]

But... it's used by this class, no? :)

The least-intrusive change would be to only remove it from the PluginService
interface, but leave it in PluginServiceImpl, but this way is fine with me too.

[jam, 2013/07/17 16:10:43]

My plan is to remove MockPluginList since most of its users are in chrome and I
want to hide PluginList altogether. I will introduce another way to do the same
thing through PluginService. At that point, there'll be no plugin_list_ member
in PluginServiceImpl. So I was doing this change in anticipation of what the
final code will look like.

       &canonical_list_);
 
   internal_plugins_.clear();
-  PluginServiceImpl::GetInstance()->GetPluginList()->GetInternalPlugins(
+  webkit::npapi::PluginList::Singleton()->GetInternalPlugins(
       &internal_plugins_);
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
@@ -163,8 +163,7 @@
   if (next_load_index_ < canonical_list_.size())
     return false;
 
-  PluginServiceImpl::GetInstance()->GetPluginList()->SetPlugins(
-      loaded_plugins_);
+  webkit::npapi::PluginList::Singleton()->SetPlugins(loaded_plugins_);
 
   // Only call the first callback with loaded plugins because there may be
   // some extra plugin paths added since the first callback is added.