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

Comparing paths does not work all the time on Linux if the plugin is wrapped and
is initially loaded from a symlinked location.

BUG=17863
TEST=Waterfall Linux(dbg)(2) plugin_tests

Review URL: http://codereview.chromium.org/8440042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108306 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 6 deletions

diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc
index f53fcd8..93b906d 100644
--- a/content/utility/utility_thread_impl.cc
+++ b/content/utility/utility_thread_impl.cc
@@ -127,21 +127,19 @@ void UtilityThreadImpl::OnLoadPlugins(
   webkit::npapi::PluginList* plugin_list =
       webkit::npapi::PluginList::Singleton();
 
-  for (std::vector<FilePath>::const_iterator it = plugin_paths.begin();
-       it != plugin_paths.end();
-       ++it) {
+  for (size_t i = 0; i < plugin_paths.size(); ++i) {
     ScopedVector<webkit::npapi::PluginGroup> plugin_groups;
-    plugin_list->LoadPlugin(*it, &plugin_groups);
+    plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups);
 
     if (plugin_groups.empty()) {
-      Send(new UtilityHostMsg_LoadPluginFailed(*it));
+      Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i]));
       continue;
     }
 
     const webkit::npapi::PluginGroup* group = plugin_groups[0];
     DCHECK_EQ(group->web_plugin_infos().size(), 1u);
 
-    Send(new UtilityHostMsg_LoadedPlugin(group->web_plugin_infos().front()));
+    Send(new UtilityHostMsg_LoadedPlugin(i, group->web_plugin_infos().front()));
   }
 
   ReleaseProcessIfNeeded();