Chromium Code Reviews| Index: content/shell/renderer/shell_content_renderer_client.cc |
| diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc |
| index 1cbc7bb7cf76381187c4a2d7750c6c78ed9c00b2..2b5aeb4cefa5afd5c65f3fe4c906166395b3b7a9 100644 |
| --- a/content/shell/renderer/shell_content_renderer_client.cc |
| +++ b/content/shell/renderer/shell_content_renderer_client.cc |
| @@ -87,13 +87,6 @@ bool ShellContentRendererClient::OverrideCreatePlugin( |
| WebFrame* frame, |
| const WebPluginParams& params, |
| WebPlugin** plugin) { |
| - std::string mime_type = params.mimeType.utf8(); |
| - if (mime_type == content::kBrowserPluginMimeType) { |
| - // Allow browser plugin in content_shell only if it is forced by flag. |
| - // Returning true here disables the plugin. |
| - return !CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kEnableBrowserPluginForAllViewTypes); |
| - } |
| return false; |
| } |
| @@ -172,12 +165,6 @@ void ShellContentRendererClient::WebTestProxyCreated(RenderView* render_view, |
| bool ShellContentRendererClient::AllowBrowserPlugin( |
| blink::WebPluginContainer* container) { |
| - if (CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kEnableBrowserPluginForAllViewTypes)) { |
| - // Allow BrowserPlugin if forced by command line flag. This is generally |
| - // true for tests. |
| - return true; |
| - } |
| return ContentRendererClient::AllowBrowserPlugin(container); |
|
Fady Samuel
2014/04/12 15:49:10
Do the tests content_browsertests BrowserPluginHos
Zachary Kuznia
2014/04/16 23:53:38
They do not. Should I just return true here?
|
| } |