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

webkit/glue/webkit_glue.h

 // 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.
 
 #ifndef WEBKIT_GLUE_WEBKIT_GLUE_H_
 #define WEBKIT_GLUE_WEBKIT_GLUE_H_
 
 #include "base/basictypes.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 #include <vector>
 
 #include "app/clipboard/clipboard.h"
 #include "base/file_path.h"
 #include "base/platform_file.h"
 #include "base/string16.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileError.h"
 
 class GURL;
 class SkBitmap;
-struct WebPluginInfo;
 
 namespace base {
 class StringPiece;
 }
 
 namespace skia {
 class PlatformCanvas;
 }
 
 namespace WebKit {
 class WebFrame;
 class WebString;
 class WebView;
 }
 
+namespace webkit {
+namespace npapi {
+struct WebPluginInfo;
+}
+}
+
 namespace webkit_glue {
 
 
 //---- BEGIN FUNCTIONS IMPLEMENTED BY WEBKIT/GLUE -----------------------------
 
 void SetJavaScriptFlags(const std::string& flags);
 
 // Turn on the logging for notImplemented() calls from WebCore.
 void EnableWebCoreNotImplementedLogging();
 
@@ skipping 166 matching lines @@
 // Path is an output parameter to receive the path.
 // Returns true if successful, false otherwise.
 bool GetApplicationDirectory(FilePath* path);
 
 // Gets the directory where the launching executable resides on disk.
 // Path is an output parameter to receive the path.
 // Returns true if successful, false otherwise.
 bool GetExeDirectory(FilePath* path);
 
 // Embedders implement this function to return the list of plugins to Webkit.
-void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins);
+void GetPlugins(bool refresh,
+                std::vector<webkit::npapi::WebPluginInfo>* plugins);
 
 // Returns true if the plugins run in the same process as the renderer, and
 // false otherwise.
 bool IsPluginRunningInRendererProcess();
 
 // Returns a bool indicating if the Null plugin should be enabled or not.
 bool IsDefaultPluginEnabled();
 
 // Returns true if the protocol implemented to serve |url| supports features
 // required by the media engine.
@@ skipping 61 matching lines @@
 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
                   size_t* output_length);
 #endif
 
 // ---- END FUNCTIONS IMPLEMENTED BY EMBEDDER ---------------------------------
 
 
 } // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBKIT_GLUE_H_