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

chrome/renderer/renderer_glue.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file provides the embedder's side of random webkit glue functions.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 187 matching lines @@
 }
 
 bool ClipboardReadFilenames(Clipboard::Buffer buffer,
                             std::vector<string16>* filenames) {
   bool result;
   RenderThread::current()->Send(new ViewHostMsg_ClipboardReadFilenames(
       buffer, &result, filenames));
   return result;
 }
 
-void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
+void GetPlugins(bool refresh,
+                std::vector<webkit::npapi::WebPluginInfo>* plugins) {
   if (!RenderThread::current()->plugin_refresh_allowed())
     refresh = false;
   RenderThread::current()->Send(new ViewHostMsg_GetPlugins(refresh, plugins));
 }
 
 bool IsProtocolSupportedForMedia(const GURL& url) {
   // If new protocol is to be added here, we need to make sure the response is
   // validated accordingly in the media engine.
   if (url.SchemeIsFile() || url.SchemeIs(chrome::kHttpScheme) ||
       url.SchemeIs(chrome::kHttpsScheme) ||
@@ skipping 92 matching lines @@
 }
 
 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
                   size_t* output_length) {
   return renderer_sandbox_support::GetFontTable(
       fd, table, output, output_length);
 }
 #endif
 
 }  // namespace webkit_glue