| Index: content/browser/renderer_host/buffered_resource_handler.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/buffered_resource_handler.cc (revision 96613)
|
| +++ content/browser/renderer_host/buffered_resource_handler.cc (working copy)
|
| @@ -389,7 +389,7 @@
|
| // Finally, check the plugin list.
|
| bool allow_wildcard = false;
|
| bool stale = false;
|
| - std::vector<webkit::npapi::WebPluginInfo> plugins;
|
| + std::vector<webkit::WebPluginInfo> plugins;
|
| webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
|
| request_->url(), type, allow_wildcard, &stale, &plugins, NULL);
|
| if (need_plugin_list) {
|
| @@ -402,7 +402,7 @@
|
| }
|
|
|
| for (size_t i = 0; i < plugins.size(); ++i) {
|
| - if (webkit::npapi::IsPluginEnabled(plugins[i]))
|
| + if (webkit::IsPluginEnabled(plugins[i]))
|
| return false;
|
| }
|
| return true;
|
| @@ -440,7 +440,7 @@
|
| }
|
|
|
| void BufferedResourceHandler::LoadPlugins() {
|
| - std::vector<webkit::npapi::WebPluginInfo> plugins;
|
| + std::vector<webkit::WebPluginInfo> plugins;
|
| webkit::npapi::PluginList::Singleton()->GetPlugins(&plugins);
|
|
|
| BrowserThread::PostTask(
|
|
|