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 19448a34672c8ee2cff3f1ba0a824189bb37c6a6..e0585ccd44ad1d01b58eab9ee459a3efe567987c 100644 |
--- a/content/shell/renderer/shell_content_renderer_client.cc |
+++ b/content/shell/renderer/shell_content_renderer_client.cc |
@@ -118,13 +118,6 @@ bool ShellContentRendererClient::OverrideCreatePlugin( |
WebLocalFrame* 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; |
} |
@@ -203,13 +196,7 @@ 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); |
+ return true; |
} |
} // namespace content |