| Index: content/utility/utility_thread_impl.cc
|
| diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc
|
| index 813d67364c4b6adc7e1b41af326c6b146375016e..ebff5906bc92abaf8ce9d8be6d4a7e458248f213 100644
|
| --- a/content/utility/utility_thread_impl.cc
|
| +++ b/content/utility/utility_thread_impl.cc
|
| @@ -112,13 +112,14 @@ void UtilityThreadImpl::OnLoadPlugins(
|
| gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
|
| #endif
|
|
|
| - ScopedVector<webkit::npapi::PluginGroup> plugin_groups;
|
| + std::vector<webkit::WebPluginInfo> plugins;
|
| // TODO(bauerb): If we restart loading plug-ins, we might mess up the logic in
|
| // PluginList::ShouldLoadPlugin due to missing the previously loaded plug-ins
|
| // in |plugin_groups|.
|
| for (size_t i = 0; i < plugin_paths.size(); ++i) {
|
| webkit::WebPluginInfo plugin;
|
| - if (!plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups, &plugin))
|
| + if (!plugin_list->LoadPluginIntoPluginList(
|
| + plugin_paths[i], &plugins, &plugin))
|
| Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i]));
|
| else
|
| Send(new UtilityHostMsg_LoadedPlugin(i, plugin));
|
|
|