Remove ContentRendererClient::AllowBrowserPlugin

BrowserPlugin can no longer create a new WebContents on its own without the chrome layer. Now that BrowserPlugin is inert, ContentRendererClient::AllowBrowserPlugin seems unnecessary.

BUG=364141

Review URL: https://codereview.chromium.org/338493002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277576 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 0 insertions, 37 deletions

diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
index 7934968..800bb55 100644
--- a/content/public/renderer/content_renderer_client.cc
+++ b/content/public/renderer/content_renderer_client.cc
@@ -154,11 +154,6 @@ bool ContentRendererClient::IsExternalPepperPlugin(
   return false;
 }
 
-bool ContentRendererClient::AllowBrowserPlugin(
-    blink::WebPluginContainer* container) {
-  return false;
-}
-
 bool ContentRendererClient::AllowPepperMediaStreamAPI(const GURL& url) {
   return false;
 }
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 5f17054..ca60039 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -235,9 +235,6 @@ class CONTENT_EXPORT ContentRendererClient {
   // startup steps).
   virtual bool IsExternalPepperPlugin(const std::string& module_name);
 
-  // Returns whether BrowserPlugin should be allowed within the |container|.
-  virtual bool AllowBrowserPlugin(blink::WebPluginContainer* container);
-
   // Returns true if the page at |url| can use Pepper MediaStream APIs.
   virtual bool AllowPepperMediaStreamAPI(const GURL& url);
 
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 086b6ab..eec9de9 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -524,10 +524,6 @@ bool BrowserPlugin::initialize(WebPluginContainer* container) {
   if (!container)
     return false;
 
-  if (!GetContentClient()->renderer()->AllowBrowserPlugin(container) &&
-      !auto_navigate_)
-    return false;
-
   // Tell |container| to allow this plugin to use script objects.
   npp_.reset(new NPP_t);
   container->allowScriptObjects();
diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
index 7eee4b9..4228466 100644
--- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc
+++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
@@ -46,19 +46,6 @@ std::string GetHTMLForBrowserPluginObject() {
 
 }  // namespace
 
-class TestContentRendererClient : public ContentRendererClient {
- public:
-  TestContentRendererClient() : ContentRendererClient() {
-  }
-  virtual ~TestContentRendererClient() {
-  }
-  virtual bool AllowBrowserPlugin(
-      blink::WebPluginContainer* container) OVERRIDE {
-    // Allow BrowserPlugin for tests.
-    return true;
-  }
-};
-
 // Test factory for creating test instances of BrowserPluginManager.
 class TestBrowserPluginManagerFactory : public BrowserPluginManagerFactory {
  public:
@@ -104,10 +91,6 @@ void BrowserPluginTest::TearDown() {
   RenderViewTest::TearDown();
 }
 
-ContentRendererClient* BrowserPluginTest::CreateContentRendererClient() {
-  return new TestContentRendererClient;
-}
-
 std::string BrowserPluginTest::ExecuteScriptAndReturnString(
     const std::string& script) {
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.h b/content/renderer/browser_plugin/browser_plugin_browsertest.h
index 415afc3..434da343 100644
--- a/content/renderer/browser_plugin/browser_plugin_browsertest.h
+++ b/content/renderer/browser_plugin/browser_plugin_browsertest.h
@@ -29,7 +29,6 @@ class BrowserPluginTest : public RenderViewTest {
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
-  virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE;
 
   MockBrowserPluginManager* browser_plugin_manager() const {
     return static_cast<MockBrowserPluginManager*>(
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index c6bb80d..3af3674 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -191,9 +191,4 @@ void ShellContentRendererClient::WebTestProxyCreated(RenderView* render_view,
       ShellRenderProcessObserver::GetInstance()->test_delegate());
 }
 
-bool ShellContentRendererClient::AllowBrowserPlugin(
-    blink::WebPluginContainer* container) {
-  return true;
-}
-
 }  // namespace content
diff --git a/content/shell/renderer/shell_content_renderer_client.h b/content/shell/renderer/shell_content_renderer_client.h
index cff6b76..84c7bd9 100644
--- a/content/shell/renderer/shell_content_renderer_client.h
+++ b/content/shell/renderer/shell_content_renderer_client.h
@@ -46,8 +46,6 @@ class ShellContentRendererClient : public ContentRendererClient {
       double sample_rate) OVERRIDE;
   virtual blink::WebClipboard* OverrideWebClipboard() OVERRIDE;
   virtual blink::WebThemeEngine* OverrideThemeEngine() OVERRIDE;
-  virtual bool AllowBrowserPlugin(
-      blink::WebPluginContainer* container) OVERRIDE;
 
  private:
   void WebTestProxyCreated(RenderView* render_view, WebTestProxyBase* proxy);