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

chrome/common/render_messages_internal.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.
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/translate_errors.h"
 #include "chrome/common/window_container_type.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/audio/audio_buffers_state.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/password_form_dom_manager.h"
-#include "webkit/glue/plugins/webplugininfo.h"
 #include "webkit/glue/webdropdata.h"
+#include "webkit/plugins/npapi/webplugininfo.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "chrome/common/font_descriptor_mac.h"
 #endif
 
 // TODO(mpcomplete): rename ViewMsg and ViewHostMsg to something that makes
@@ skipping 1310 matching lines @@
 
 // Used to check if cookies are enabled for the given URL. This may block
 // waiting for a previous SetCookie message to be processed.
 IPC_SYNC_MESSAGE_ROUTED2_1(ViewHostMsg_CookiesEnabled,
                            GURL /* url */,
                            GURL /* first_party_for_cookies */,
                            bool /* cookies_enabled */)
 
 // Used to get the list of plugins
 IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_GetPlugins,
-                            bool /* refresh*/,
-                            std::vector<WebPluginInfo> /* plugins */)
+    bool /* refresh*/,
+    std::vector<webkit::npapi::WebPluginInfo> /* plugins */)
 
 // Return information about a plugin for the given URL and MIME
 // type. If there is no matching plugin, |found| is false.  If
 // |enabled| in the WebPluginInfo struct is false, the plug-in is
 // treated as if it was not installed at all.
 //
 // If |setting| is set to CONTENT_SETTING_BLOCK, the plug-in is
 // blocked by the content settings for |policy_url|. It still
 // appears in navigator.plugins in Javascript though, and can be
 // loaded via click-to-play.
 //
 // If |setting| is set to CONTENT_SETTING_ALLOW, the domain is
 // explicitly white-listed for the plug-in, or the user has chosen
 // not to block nonsandboxed plugins.
 //
 // If |setting| is set to CONTENT_SETTING_DEFAULT, the plug-in is
 // neither blocked nor white-listed, which means that it's allowed
 // by default and can still be blocked if it's non-sandboxed.
 //
 // |actual_mime_type| is the actual mime type supported by the
 // plugin found that match the URL given (one for each item in
 // |info|).
 IPC_SYNC_MESSAGE_CONTROL3_4(ViewHostMsg_GetPluginInfo,
                             GURL /* url */,
                             GURL /* policy_url */,
                             std::string /* mime_type */,
                             bool /* found */,
-                            WebPluginInfo /* plugin info */,
+                            webkit::npapi::WebPluginInfo /* plugin info */,
                             ContentSetting /* setting */,
                             std::string /* actual_mime_type */)
 
 // Requests spellcheck for a word.
 IPC_SYNC_MESSAGE_ROUTED2_2(ViewHostMsg_SpellCheck,
                            string16 /* word to check */,
                            int /* document tag*/,
                            int /* misspell location */,
                            int /* misspell length */)
 
@@ skipping 123 matching lines @@
                     std::string  /* target */)
 
 // A renderer sends this to the browser process when it wants to
 // create a plugin.  The browser will create the plugin process if
 // necessary, and will return a handle to the channel on success.
 // On error an empty string is returned.
 IPC_SYNC_MESSAGE_CONTROL2_2(ViewHostMsg_OpenChannelToPlugin,
                             GURL /* url */,
                             std::string /* mime_type */,
                             IPC::ChannelHandle /* channel_handle */,
-                            WebPluginInfo /* info */)
+                            webkit::npapi::WebPluginInfo /* info */)
 
 // A renderer sends this to the browser process when it wants to
 // create a pepper plugin.  The browser will create the plugin process if
 // necessary, and will return a handle to the channel on success.
 // On error an empty string is returned.
 IPC_SYNC_MESSAGE_CONTROL1_2(ViewHostMsg_OpenChannelToPepperPlugin,
                             FilePath /* path */,
                             base::ProcessHandle /* plugin_process_handle */,
                             IPC::ChannelHandle /* handle to channel */)
 
@@ skipping 1074 matching lines @@
 // to ViewMsg_ScriptEvalRequest. The result has the value returned by the
 // script as it's only element, one of Null, Boolean, Integer, Real, Date, or
 // String.
 IPC_MESSAGE_ROUTED2(ViewHostMsg_ScriptEvalResponse,
                     int  /* id */,
                     ListValue  /* result */)
 
 // Updates the content restrictions, i.e. to disable print/copy.
 IPC_MESSAGE_ROUTED1(ViewHostMsg_UpdateContentRestrictions,
                     int /* restrictions */)