Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/browser/plugin_loader_posix.cc

Index: content/browser/plugin_loader_posix.cc
===================================================================
--- content/browser/plugin_loader_posix.cc	(revision 212369)
+++ content/browser/plugin_loader_posix.cc	(working copy)
@@ -10,9 +10,9 @@
 #include "base/metrics/histogram.h"
 #include "content/browser/utility_process_host_impl.h"
 #include "content/common/child_process_host_impl.h"
+#include "content/common/plugin_list.h"
 #include "content/common/utility_messages.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 
 namespace content {
 
@@ -75,12 +75,10 @@
   next_load_index_ = 0;
 
   canonical_list_.clear();
-  webkit::npapi::PluginList::Singleton()->GetPluginPathsToLoad(
-      &canonical_list_);
+  PluginList::Singleton()->GetPluginPathsToLoad(&canonical_list_);
 
   internal_plugins_.clear();
-  webkit::npapi::PluginList::Singleton()->GetInternalPlugins(
-      &internal_plugins_);
+  PluginList::Singleton()->GetInternalPlugins(&internal_plugins_);
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&PluginLoaderPosix::LoadPluginsInternal,
@@ -163,7 +161,7 @@
   if (next_load_index_ < canonical_list_.size())
     return false;
 
-  webkit::npapi::PluginList::Singleton()->SetPlugins(loaded_plugins_);
+  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.