Send the index in the canonical list over IPC when using the OOP plugin loader.

content/browser/plugin_loader_posix.cc

Index: content/browser/plugin_loader_posix.cc
diff --git a/content/browser/plugin_loader_posix.cc b/content/browser/plugin_loader_posix.cc
index 14d7c02eef018a4a2473340f8d92fd13465ce21d..fb83cdd4aa5ba29c45bd1a12dc0b67180044d79e 100644
--- a/content/browser/plugin_loader_posix.cc
+++ b/content/browser/plugin_loader_posix.cc
@@ -101,10 +101,11 @@ void PluginLoaderPosix::LoadPluginsInternal() {
   process_host_->Send(new UtilityMsg_LoadPlugins(canonical_list_));
 }
 
-void PluginLoaderPosix::OnPluginLoaded(const webkit::WebPluginInfo& plugin) {
-  if (plugin.path.value() != canonical_list_[next_load_index_].value()) {
+void PluginLoaderPosix::OnPluginLoaded(size_t index,
+                                       const webkit::WebPluginInfo& plugin) {
+  if (index != next_load_index_) {
     LOG(ERROR) << "Received unexpected plugin load message for "
-               << plugin.path.value();
+               << plugin.path.value() << "; index=" << index;
     return;
   }
 
@@ -116,10 +117,11 @@ void PluginLoaderPosix::OnPluginLoaded(const webkit::WebPluginInfo& plugin) {
   MaybeRunPendingCallbacks();
 }
 
-void PluginLoaderPosix::OnPluginLoadFailed(const FilePath& plugin_path) {
-  if (plugin_path.value() != canonical_list_[next_load_index_].value()) {
+void PluginLoaderPosix::OnPluginLoadFailed(size_t index,
+                                           const FilePath& plugin_path) {
+  if (index != next_load_index_) {
     LOG(ERROR) << "Received unexpected plugin load failure message for "
-               << plugin_path.value();
+               << plugin_path.value() << "; index=" << index;
     return;
   }