summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_settings
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-24 10:00:55 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-24 10:00:55 +0000
commit6ffd22c7dc3c6dc88f48a1f8fe2b4726dbb12f49 (patch)
treeb521a4c5fdff166694362d230399aa202b8c8f06 /chrome/browser/content_settings
parent8dc1eb64b54092b997f82bb2ec84fa665e56efcb (diff)
downloadchromium_src-6ffd22c7dc3c6dc88f48a1f8fe2b4726dbb12f49.zip
chromium_src-6ffd22c7dc3c6dc88f48a1f8fe2b4726dbb12f49.tar.gz
chromium_src-6ffd22c7dc3c6dc88f48a1f8fe2b4726dbb12f49.tar.bz2
Deal with plug-ins removing themselves on initialization inside a PluginPlaceholder.
BUG=156366 Review URL: https://chromiumcodereview.appspot.com/11190051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
-rw-r--r--chrome/browser/content_settings/content_settings_browsertest.cc20
1 files changed, 20 insertions, 0 deletions
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index ce32300..30dce25 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -412,4 +412,24 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, NoCallbackAtLoad) {
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();
+ host->Send(new ChromeViewMsg_LoadBlockedPlugins(
+ host->GetRoutingID(), std::string()));
+
+ EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
+}
+
#endif // !defined(USE_AURA)