Gracefully handle child process death in out-of-process plugin loading.

content/common/utility_messages.h

 // Copyright (c) 2011 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.
 
 // Multiply-included message file, so no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 22 matching lines @@
                      SerializedScriptValue /* value */,
                      string16 /* key path*/)
 
 // Tells the utility process that it's running in batch mode.
 IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Started)
 
 // Tells the utility process that it can shutdown.
 IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Finished)
 
 #if defined(OS_POSIX)
-// Tells the utility process to load the plugins from disk and send a list of
-// WebPluginInfo objects back.
-IPC_MESSAGE_CONTROL3(UtilityMsg_LoadPlugins,
-                     std::vector<FilePath>, /* extra plugin paths */
-                     std::vector<FilePath>, /* extra plugin dirs */
-                     std::vector<webkit::WebPluginInfo> /* internal 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<FilePath> /* plugin paths */)
 #endif
 
 //------------------------------------------------------------------------------
 // Utility process host messages:
 // These are messages from the utility process to the browser.
 
 // Reply when the utility process has succeeded in obtaining the value for
 // IDBKeyPath.
 IPC_MESSAGE_CONTROL2(UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Succeeded,
                      int /* id */,
                      std::vector<IndexedDBKey> /* value */)
 
 // Reply when the utility process has failed in obtaining the value for
 // IDBKeyPath.
 IPC_MESSAGE_CONTROL1(UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Failed,
                      int /* id */)
 
 // Reply when the utility process has finished injecting an IDBKey into
 // a SerializedScriptValue.
 IPC_MESSAGE_CONTROL1(UtilityHostMsg_InjectIDBKey_Finished,
                      SerializedScriptValue /* new value */)
 
 #if defined(OS_POSIX)
-// After loading plugins from disk and querying each for MIME information, this
-// sends the resulting WebPluginInfo back to the browser process.
-IPC_MESSAGE_CONTROL1(UtilityHostMsg_LoadedPlugins,
-                     std::vector<webkit::WebPluginInfo> /* plugin infos */)
+// Notifies the browser when a plugin failed to load so the two processes can
+// keep the canonical list in sync.
+IPC_SYNC_MESSAGE_CONTROL1_0(UtilityHostMsg_LoadPluginFailed,
+                            FilePath /* path of plugin */)
+
+// Notifies the browser that a plugin in the vector sent by it has been loaded.
+IPC_SYNC_MESSAGE_CONTROL1_0(UtilityHostMsg_LoadedPlugin,
+                            webkit::WebPluginInfo /* plugin info */)
 #endif  // OS_POSIX