Broke ContentSettingBubbleModelTest.Plugins on Android.

content/browser/plugin_service_impl_browsertest.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/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/plugin_service_filter.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/plugin_utils.h"
 
 namespace content {
 
 const char kNPAPITestPluginMimeType[] = "application/vnd.npapi-test";
 
 void OpenChannel(PluginProcessHost::Client* client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Start opening the channel
   PluginServiceImpl::GetInstance()->OpenChannelToNpapiPlugin(
       0, 0, GURL(), GURL(), kNPAPITestPluginMimeType, client);
 }
 
 // Mock up of the Client and the Listener classes that would supply the
 // communication channel with the plugin.
 class MockPluginProcessHostClient : public PluginProcessHost::Client,
                                     public IPC::Listener {
  public:
-  MockPluginProcessHostClient(ResourceContext* context, bool expect_fail)
+  MockPluginProcessHostClient(ResourceContext* context)
       : context_(context),
         channel_(NULL),
-        set_plugin_info_called_(false),
-        expect_fail_(expect_fail) {
+        set_plugin_info_called_(false) {
   }
 
   virtual ~MockPluginProcessHostClient() {
     if (channel_)
       BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, channel_);
   }
 
   // PluginProcessHost::Client implementation.
   virtual int ID() OVERRIDE { return 42; }
   virtual bool OffTheRecord() OVERRIDE { return false; }
@@ skipping 20 matching lines @@
   virtual void OnError() OVERRIDE {
     Fail();
   }
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
     Fail();
     return false;
   }
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
-    if (expect_fail_)
-      FAIL();
     QuitMessageLoop();
   }
   virtual void OnChannelError() OVERRIDE {
     Fail();
   }
 #if defined(OS_POSIX)
   virtual void OnChannelDenied() OVERRIDE {
     Fail();
   }
   virtual void OnChannelListenError() OVERRIDE {
     Fail();
   }
 #endif
 
  private:
   void Fail() {
-    if (!expect_fail_)
-      FAIL();
+    FAIL();
     QuitMessageLoop();
   }
 
   void QuitMessageLoop() {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             MessageLoop::QuitClosure());
   }
 
   ResourceContext* context_;
   IPC::Channel* channel_;
   bool set_plugin_info_called_;
-  bool expect_fail_;
   DISALLOW_COPY_AND_ASSIGN(MockPluginProcessHostClient);
 };
 
-class MockPluginServiceFilter : public content::PluginServiceFilter {
- public:
-  MockPluginServiceFilter() {}
-
-  virtual bool IsPluginEnabled(
-      int render_process_id,
-      int render_view_id,
-      const void* context,
-      const GURL& url,
-      const GURL& policy_url,
-      webkit::WebPluginInfo* plugin) OVERRIDE { return true; }
-
-  virtual bool CanLoadPlugin(
-      int render_process_id,
-      const FilePath& path) OVERRIDE { return false; }
-};
-
 class PluginServiceTest : public ContentBrowserTest {
  public:
   PluginServiceTest() {}
 
   ResourceContext* GetResourceContext() {
     return shell()->web_contents()->GetBrowserContext()->GetResourceContext();
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
 #ifdef OS_MACOSX
     FilePath browser_directory;
     PathService::Get(base::DIR_MODULE, &browser_directory);
     command_line->AppendSwitchPath(switches::kExtraPluginDir,
                                    browser_directory.AppendASCII("plugins"));
 #endif
     // TODO(jam): since these plugin tests are running under Chrome, we need to
     // tell it to disable its security features for old plugins. Once this is
     // running under content_browsertests, these flags won't be needed.
     // http://crbug.com/90448
     // switches::kAlwaysAuthorizePlugins
     command_line->AppendSwitch("always-authorize-plugins");
   }
 };
 
 // Try to open a channel to the test plugin. Minimal plugin process spawning
 // test for the PluginService interface.
 IN_PROC_BROWSER_TEST_F(PluginServiceTest, OpenChannelToPlugin) {
   if (!webkit::npapi::NPAPIPluginsSupported())
     return;
-  MockPluginProcessHostClient mock_client(GetResourceContext(), false);
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&OpenChannel, &mock_client));
-  RunMessageLoop();
-}
-
-IN_PROC_BROWSER_TEST_F(PluginServiceTest, OpenChannelToDeniedPlugin) {
-  if (!webkit::npapi::NPAPIPluginsSupported())
-    return;
-  MockPluginServiceFilter filter;
-  PluginServiceImpl::GetInstance()->SetFilter(&filter);
-  MockPluginProcessHostClient mock_client(GetResourceContext(), true);
+  MockPluginProcessHostClient mock_client(GetResourceContext());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&OpenChannel, &mock_client));
   RunMessageLoop();
 }
 
 // A strict mock that fails if any of the methods are called. They shouldn't be
 // called since the request should get canceled before then.
 class MockCanceledPluginServiceClient : public PluginProcessHost::Client {
  public:
@@ skipping 181 matching lines @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(&OpenChannel, &mock_client));
   RunMessageLoop();
   EXPECT_TRUE(mock_client.get_resource_context_called());
   EXPECT_TRUE(mock_client.set_plugin_info_called());
   EXPECT_TRUE(mock_client.on_found_plugin_process_host_called());
   EXPECT_TRUE(mock_client.on_sent_plugin_channel_request_called());
 }
 
 }  // namespace content