Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/common/default_plugin.cc

Index: chrome/common/default_plugin.cc
diff --git a/chrome/common/default_plugin.cc b/chrome/common/default_plugin.cc
index bba738b5973377e54c2ccf18cb912c1bf3b53dd0..3337c7ccdb762b14d7e4397696d98ed7e6067520 100644
--- a/chrome/common/default_plugin.cc
+++ b/chrome/common/default_plugin.cc
@@ -5,13 +5,13 @@
 #include "chrome/common/default_plugin.h"
 
 #include "chrome/default_plugin/plugin_main.h"
-#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_list.h"
 
 namespace chrome {
 
 void RegisterInternalDefaultPlugin() {
-  const NPAPI::PluginVersionInfo default_plugin = {
-    FilePath(kDefaultPluginLibraryName),
+  const webkit::npapi::PluginVersionInfo default_plugin = {
+    FilePath(webkit::npapi::kDefaultPluginLibraryName),
     L"Default Plug-in",
     L"Provides functionality for installing third-party plug-ins",
     L"1",
@@ -27,7 +27,8 @@ void RegisterInternalDefaultPlugin() {
     }
   };
 
-  NPAPI::PluginList::Singleton()->RegisterInternalPlugin(default_plugin);
+  webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(
+      default_plugin);
 }
 
 }  // namespace chrome