Remove kEnableBrowserPluginForAllViewTypes flag

content/shell/renderer/shell_content_renderer_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/shell_content_renderer_client.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "content/public/common/content_constants.h"
@@ skipping 69 matching lines @@
       ShellRenderProcessObserver::GetInstance()->test_delegate();
   if (delegate == static_cast<WebTestDelegate*>(test_runner))
     ShellRenderProcessObserver::GetInstance()->SetMainWindow(render_view);
 }
 
 bool ShellContentRendererClient::OverrideCreatePlugin(
     RenderFrame* render_frame,
     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;
 }
 
 WebMediaStreamCenter*
 ShellContentRendererClient::OverrideCreateWebMediaStreamCenter(
     WebMediaStreamCenterClient* client) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
     return NULL;
 #if defined(ENABLE_WEBRTC)
   WebTestInterfaces* interfaces =
@@ skipping 58 matching lines @@
   if (!ShellRenderProcessObserver::GetInstance()->test_delegate())
     ShellRenderProcessObserver::GetInstance()->SetTestDelegate(test_runner);
   proxy->setInterfaces(
       ShellRenderProcessObserver::GetInstance()->test_interfaces());
   test_runner->proxy()->setDelegate(
       ShellRenderProcessObserver::GetInstance()->test_delegate());
 }
 
 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 BrowserPluginHostTest.* and BrowserPlugin.*
still pass?

[Zachary Kuznia, 2014/04/16 23:53:38]

They do not.  Should I just return true here?

 }
 
 }  // namespace content