| Index: webkit/tools/test_shell/test_webview_delegate_win.cc
|
| ===================================================================
|
| --- webkit/tools/test_shell/test_webview_delegate_win.cc (revision 25626)
|
| +++ webkit/tools/test_shell/test_webview_delegate_win.cc (working copy)
|
| @@ -129,7 +129,6 @@
|
| webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
|
| const GURL& url,
|
| const std::string& mime_type,
|
| - const std::string& clsid,
|
| std::string* actual_mime_type) {
|
| HWND hwnd = shell_->webViewHost()->view_handle();
|
| if (!hwnd)
|
| @@ -137,10 +136,10 @@
|
|
|
| bool allow_wildcard = true;
|
| WebPluginInfo info;
|
| - if (!NPAPI::PluginList::Singleton()->GetPluginInfo(url, mime_type, clsid,
|
| - allow_wildcard, &info,
|
| - actual_mime_type))
|
| + if (!NPAPI::PluginList::Singleton()->GetPluginInfo(
|
| + url, mime_type, allow_wildcard, &info, actual_mime_type)) {
|
| return NULL;
|
| + }
|
|
|
| if (actual_mime_type && !actual_mime_type->empty())
|
| return WebPluginDelegateImpl::Create(info.path, *actual_mime_type, hwnd);
|
|
|