Merge 180159

chrome/browser/content_settings/content_settings_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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/plugin_service.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/net/url_request_mock_http_job.h"
 #include "net/test/test_server.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 271 matching lines @@
   GURL url = ui_test_utils::GetTestUrl(
       FilePath(), FilePath().AppendASCII("clicktoplay.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   string16 expected_title(ASCIIToUTF16("OK"));
   content::TitleWatcher title_watcher(
       chrome::GetActiveWebContents(browser()), expected_title);
 
   content::RenderViewHost* host =
       chrome::GetActiveWebContents(browser())->GetRenderViewHost();
+  ChromePluginServiceFilter* filter = ChromePluginServiceFilter::GetInstance();
+  int process_id = host->GetProcess()->GetID();
+  FilePath path(FILE_PATH_LITERAL("blah"));
+  EXPECT_FALSE(filter->CanLoadPlugin(process_id, path));
+  filter->AuthorizeAllPlugins(process_id);
+  EXPECT_TRUE(filter->CanLoadPlugin(process_id, path));
   host->Send(new ChromeViewMsg_LoadBlockedPlugins(
       host->GetRoutingID(), std::string()));
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 // Verify that plugins can be allowed on a domain by adding an exception
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, AllowException) {
   GURL url = ui_test_utils::GetTestUrl(
       FilePath(), FilePath().AppendASCII("clicktoplay.html"));
@@ skipping 40 matching lines @@
   GURL url = ui_test_utils::GetTestUrl(
       FilePath(), FilePath().AppendASCII("load_all_blocked_plugins.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   string16 expected_title1(ASCIIToUTF16("1"));
   content::TitleWatcher title_watcher1(
       chrome::GetActiveWebContents(browser()), expected_title1);
 
   content::RenderViewHost* host =
       chrome::GetActiveWebContents(browser())->GetRenderViewHost();
+  ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
+      host->GetProcess()->GetID());
   host->Send(new ChromeViewMsg_LoadBlockedPlugins(
       host->GetRoutingID(), std::string()));
   EXPECT_EQ(expected_title1, title_watcher1.WaitAndGetTitle());
 
   string16 expected_title2(ASCIIToUTF16("2"));
   content::TitleWatcher title_watcher2(
       chrome::GetActiveWebContents(browser()), expected_title2);
 
   ASSERT_TRUE(content::ExecuteJavaScript(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
@@ skipping 14 matching lines @@
   ASSERT_TRUE(content::ExecuteJavaScript(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"CallOnStartup = function() { document.title = \"OK\"; }"));
 
   string16 expected_title(ASCIIToUTF16("OK"));
   content::TitleWatcher title_watcher(
       chrome::GetActiveWebContents(browser()), expected_title);
 
   content::RenderViewHost* host =
       chrome::GetActiveWebContents(browser())->GetRenderViewHost();
+  ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
+      host->GetProcess()->GetID());
   host->Send(new ChromeViewMsg_LoadBlockedPlugins(
       host->GetRoutingID(), std::string()));
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, DeleteSelfAtLoad) {
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
   GURL url = ui_test_utils::GetTestUrl(
       FilePath(), FilePath().AppendASCII("plugin_delete_self_at_load.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   string16 expected_title(ASCIIToUTF16("OK"));
   content::TitleWatcher title_watcher(
       chrome::GetActiveWebContents(browser()), expected_title);
 
   content::RenderViewHost* host =
       chrome::GetActiveWebContents(browser())->GetRenderViewHost();
+  ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
+      host->GetProcess()->GetID());
   host->Send(new ChromeViewMsg_LoadBlockedPlugins(
       host->GetRoutingID(), std::string()));
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 #endif  // !defined(USE_AURA)