Remove NPAPI from browser and utility

content/common/utility_messages.h

Index: content/common/utility_messages.h
diff --git a/content/common/utility_messages.h b/content/common/utility_messages.h
index a76986ede7c3703c7bf919b16b9f8a3efd3cbb5b..70ed0b3553ea48b338c994461b816ce12da8d77c 100644
--- a/content/common/utility_messages.h
+++ b/content/common/utility_messages.h
@@ -4,15 +4,8 @@
 
 // Multiply-included message file, so no include guard.
 
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-
 #include "build/build_config.h"

[dcheng, 2016/04/05 08:18:04]

This one too, I think? Unless I'm missing something.

[Avi (use Gerrit), 2016/04/05 12:36:43]

Yes; that was for OS_* and the file doesn't need it any more.

[piman, 2016/04/05 15:16:37]

You're just missing me being dense/sleepy. I'll remove.

[piman, 2016/04/05 19:59:29]

Done.

 #include "content/common/content_export.h"
-#include "content/public/common/common_param_traits.h"
-#include "content/public/common/webplugininfo.h"
 #include "ipc/ipc_message_macros.h"
 
 #undef IPC_MESSAGE_EXPORT
@@ -28,27 +21,3 @@ IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Started)
 
 // Tells the utility process that it can shutdown.
 IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Finished)
-
-#if defined(OS_POSIX) && defined(ENABLE_PLUGINS)
-// Tells the utility process to load each plugin in the order specified by the
-// vector. It will respond after each load with the WebPluginInfo.
-IPC_MESSAGE_CONTROL1(UtilityMsg_LoadPlugins,
-                     std::vector<base::FilePath> /* plugin paths */)
-#endif
-
-//------------------------------------------------------------------------------
-// Utility process host messages:
-// These are messages from the utility process to the browser.
-
-#if defined(OS_POSIX) && defined(ENABLE_PLUGINS)
-// Notifies the browser when a plugin failed to load so the two processes can
-// keep the canonical list in sync.
-IPC_SYNC_MESSAGE_CONTROL2_0(UtilityHostMsg_LoadPluginFailed,
-                            uint32_t /* index in the vector */,
-                            base::FilePath /* path of plugin */)
-
-// Notifies the browser that a plugin in the vector sent by it has been loaded.
-IPC_SYNC_MESSAGE_CONTROL2_0(UtilityHostMsg_LoadedPlugin,
-                            uint32_t /* index in the vector */,
-                            content::WebPluginInfo /* plugin info */)
-#endif