| Index: webkit/tools/test_shell/test_webview_delegate.cc
|
| diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
|
| index 4fe8d69ce14e3bd3b69b2d4b8d88ffdf7eb50781..41bf9d3c2819e9b81e34fe9942bd510bdfb8e6cf 100644
|
| --- a/webkit/tools/test_shell/test_webview_delegate.cc
|
| +++ b/webkit/tools/test_shell/test_webview_delegate.cc
|
| @@ -702,12 +702,8 @@ WebPlugin* TestWebViewDelegate::createPlugin(
|
| std::string actual_mime_type;
|
| if (!NPAPI::PluginList::Singleton()->GetPluginInfo(
|
| params.url, params.mimeType.utf8(), allow_wildcard, &info,
|
| - &actual_mime_type) || !info.enabled) {
|
| + &actual_mime_type) || !info.enabled)
|
| return NULL;
|
| - }
|
| -
|
| - if (actual_mime_type.empty())
|
| - actual_mime_type = params.mimeType.utf8();
|
|
|
| return new webkit_glue::WebPluginImpl(
|
| frame, params, info.path, actual_mime_type, AsWeakPtr());
|
|
|