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

chrome/common/gpu_plugin.cc

Index: chrome/common/gpu_plugin.cc
diff --git a/chrome/common/gpu_plugin.cc b/chrome/common/gpu_plugin.cc
index 84ab33999ed02e97b095cfa342fa9bd05166786e..4600638aa671f614efdb2b892e80ba3165ad8025 100644
--- a/chrome/common/gpu_plugin.cc
+++ b/chrome/common/gpu_plugin.cc
@@ -9,18 +9,15 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "gpu/gpu_plugin/gpu_plugin.h"
-#include "webkit/glue/plugins/plugin_list.h"
-
-#if defined(ENABLE_GPU)
-#include "webkit/glue/plugins/plugin_constants_win.h"
-#endif
+#include "webkit/plugins/npapi/plugin_list.h"
 
 namespace chrome {
 
 void RegisterInternalGPUPlugin() {
 #if defined(ENABLE_GPU)
-  static const std::wstring kWideMimeType = ASCIIToWide(kGPUPluginMimeType);
-  static const NPAPI::PluginVersionInfo kGPUPluginInfo = {
+  static const std::wstring kWideMimeType = ASCIIToWide(
+      "application/vnd.google.chrome.gpu-plugin");
+  static const webkit::npapi::PluginVersionInfo kGPUPluginInfo = {
     FilePath(FILE_PATH_LITERAL("gpu-plugin")),
     L"GPU Plug-in",
     L"GPU Rendering Plug-in",
@@ -38,7 +35,8 @@ void RegisterInternalGPUPlugin() {
   };
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableGPUPlugin))
-    NPAPI::PluginList::Singleton()->RegisterInternalPlugin(kGPUPluginInfo);
+    webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(
+        kGPUPluginInfo);
 #endif  // ENABLE_GPU
 }