Remove the two years old code to enable the nacl plugin once if it's disabled. This was added to deal with old profiles when we had the plugin disabled by default. There have been 15 releases in the meantime, which is enough chances to update this pref.

This is in preparation for moving webkit/plugins to content/.

BUG=237249
R=bauerb@chromium.org

Review URL: https://codereview.chromium.org/19518006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212104 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 3 insertions, 12 deletions

diff --git a/content/browser/plugin_loader_posix.cc b/content/browser/plugin_loader_posix.cc
index 56a6839..b33cc80 100644
--- a/content/browser/plugin_loader_posix.cc
+++ b/content/browser/plugin_loader_posix.cc
@@ -75,11 +75,11 @@ void PluginLoaderPosix::GetPluginsToLoad() {
   next_load_index_ = 0;
 
   canonical_list_.clear();
-  PluginServiceImpl::GetInstance()->GetPluginList()->GetPluginPathsToLoad(
+  webkit::npapi::PluginList::Singleton()->GetPluginPathsToLoad(
       &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 @@ bool PluginLoaderPosix::MaybeRunPendingCallbacks() {
   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.
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index 89681bd..6ed78ea 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -793,8 +793,4 @@ void PluginServiceImpl::GetInternalPlugins(
   plugin_list_->GetInternalPlugins(plugins);
 }
 
-webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
-  return plugin_list_;
-}
-
 }  // namespace content
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
index 3349672..c0528f4 100644
--- a/content/browser/plugin_service_impl.h
+++ b/content/browser/plugin_service_impl.h
@@ -108,7 +108,6 @@ class CONTENT_EXPORT PluginServiceImpl
       const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
   virtual void GetInternalPlugins(
       std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
-  virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE;
   virtual void SetPluginListForTesting(
       webkit::npapi::PluginList* plugin_list) OVERRIDE;
 #if defined(OS_MACOSX)
diff --git a/content/public/browser/plugin_service.h b/content/public/browser/plugin_service.h
index c1c42f8..d1e9323 100644
--- a/content/public/browser/plugin_service.h
+++ b/content/public/browser/plugin_service.h
@@ -133,9 +133,6 @@ class PluginService {
   virtual void GetInternalPlugins(
       std::vector<webkit::WebPluginInfo>* plugins) = 0;
 
-  // TODO(dpranke): This should be private.
-  virtual webkit::npapi::PluginList* GetPluginList() = 0;
-
   virtual void SetPluginListForTesting(
       webkit::npapi::PluginList* plugin_list) = 0;