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

chrome/common/render_messages.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 CHROME_COMMON_RENDER_MESSAGES_H_
 #define CHROME_COMMON_RENDER_MESSAGES_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 43 matching lines @@
 
 namespace webkit_glue {
 struct FormData;
 class FormField;
 struct PasswordFormFillData;
 struct ResourceDevToolsInfo;
 struct ResourceLoadTimingInfo;
 struct ResourceResponseInfo;
 struct WebAccessibility;
 struct WebCookie;
+struct WebAccessibility;
+}
+
+namespace webkit {
+namespace npapi {
 struct WebPluginGeometry;
-struct WebAccessibility;
+struct WebPluginInfo;
+struct WebPluginMimeType;
+}
 }
 
 struct AudioBuffersState;
 class ExtensionExtent;
 class GURL;
 class SkBitmap;
 class URLPattern;
 struct ContextMenuParams;
 struct EditCommand;
 struct ResourceResponseHead;
 struct SyncLoadResult;
 struct RendererPreferences;
 struct WebDropData;
 struct WebMenuItem;
-struct WebPluginInfo;
-struct WebPluginMimeType;
 struct WebPreferences;
 
 // Forward declarations of structures used to store data for when we have a lot
 // of parameters.
 struct ViewMsg_Navigate_Params;
 struct ViewMsg_AudioStreamState_Params;
 struct ViewMsg_StopFinding_Params;
 struct ViewHostMsg_GetSearchProviderInstallState_Params;
 struct ViewHostMsg_PageHasOSDD_Type;
 struct ViewHostMsg_FrameNavigate_Params;
@@ skipping 52 matching lines @@
 
 template <>
 struct ParamTraits<ContextMenuParams> {
   typedef ContextMenuParams param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct ParamTraits<webkit_glue::WebPluginGeometry> {
-  typedef webkit_glue::WebPluginGeometry param_type;
+struct ParamTraits<webkit::npapi::WebPluginGeometry> {
+  typedef webkit::npapi::WebPluginGeometry param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 // Traits for ViewMsg_GetPlugins_Reply structure to pack/unpack.
 template <>
-struct ParamTraits<WebPluginMimeType> {
-  typedef WebPluginMimeType param_type;
+struct ParamTraits<webkit::npapi::WebPluginMimeType> {
+  typedef webkit::npapi::WebPluginMimeType param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct ParamTraits<WebPluginInfo> {
-  typedef WebPluginInfo param_type;
+struct ParamTraits<webkit::npapi::WebPluginInfo> {
+  typedef webkit::npapi::WebPluginInfo param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 // Traits for webkit_glue::PasswordFormDomManager::FillData.
 template <>
 struct ParamTraits<webkit_glue::PasswordFormFillData> {
   typedef webkit_glue::PasswordFormFillData param_type;
   static void Write(Message* m, const param_type& p);
@@ skipping 361 matching lines @@
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 }  // namespace IPC
 
 #include "chrome/common/render_messages_internal.h"
 
 #endif  // CHROME_COMMON_RENDER_MESSAGES_H_