Add tests for recent popup blocker fixes

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

 // Copyright 2013 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/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 240 matching lines @@
   browser()->profile()->GetHostContentSettingsMap()
       ->SetContentSetting(ContentSettingsPattern::FromURL(url),
                           ContentSettingsPattern::Wildcard(),
                           CONTENT_SETTINGS_TYPE_POPUPS,
                           std::string(),
                           CONTENT_SETTING_ALLOW);
 
   NavigateAndCheckPopupShown(url);
 }
 
+// Verify that content settings are applied based on the top-level frame URL.
+IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
+                       AllowPopupThroughContentSettingIFrame) {
+  GURL url(ui_test_utils::GetTestUrl(
+      base::FilePath(kTestDir),
+      base::FilePath(FILE_PATH_LITERAL("popup-frames.html"))));
+  GURL frame_url(ui_test_utils::GetTestUrl(

[Bernhard Bauer, 2013/09/12 13:39:22]

Nit: You could move this declaration down to where it's first used.

+      base::FilePath(kTestDir),
+      base::FilePath(FILE_PATH_LITERAL("popup-frames-iframe.html"))));
+  browser()->profile()->GetHostContentSettingsMap()

[Bernhard Bauer, 2013/09/12 13:39:22]

Nit: Extract the HCSM into a local variable?

+      ->SetContentSetting(ContentSettingsPattern::FromURL(url),
+                          ContentSettingsPattern::Wildcard(),
+                          CONTENT_SETTINGS_TYPE_POPUPS,
+                          std::string(),
+                          CONTENT_SETTING_ALLOW);
+
+  // Popup from the iframe should be allowed since the top-level URL is
+  // whitelisted.
+  NavigateAndCheckPopupShown(url);
+
+  // Whitelist iframe URL instead.
+  browser()->profile()->GetHostContentSettingsMap()->ClearSettingsForOneType(
+      CONTENT_SETTINGS_TYPE_POPUPS);
+  browser()->profile()->GetHostContentSettingsMap()
+      ->SetContentSetting(ContentSettingsPattern::FromURL(frame_url),
+                          ContentSettingsPattern::Wildcard(),
+                          CONTENT_SETTINGS_TYPE_POPUPS,
+                          std::string(),
+                          CONTENT_SETTING_ALLOW);
+
+  // Popup should be blocked.
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_EQ(1, GetBlockedContentsCount());
+}
+
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
                        PopupsLaunchWhenTabIsClosed) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kDisablePopupBlocking);
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(kTestDir),
       base::FilePath(FILE_PATH_LITERAL("popup-on-unload.html")));
   ui_test_utils::NavigateToURL(browser(), url);
 
   NavigateAndCheckPopupShown(GURL(content::kAboutBlankURL));
@@ skipping 89 matching lines @@
   WebContents* popup =
       RunCheckTest(browser(),
                    base::FilePath(FILE_PATH_LITERAL("popup-webui.html")),
                    true,
                    false);
 
   // Check that the new popup displays about:blank.
   EXPECT_EQ(GURL(content::kAboutBlankURL), popup->GetURL());
 }
 
+// Verify that the renderer can't DOS the browser by creating arbitrarily many
+// popus.

[Bernhard Bauer, 2013/09/12 13:39:22]

Nit: "popups"

+IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, DenialOfService) {
+  GURL url(ui_test_utils::GetTestUrl(
+      base::FilePath(kTestDir),
+      base::FilePath(FILE_PATH_LITERAL("popup-dos.html"))));
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_EQ(25, GetBlockedContentsCount());
+}
+
 }  // namespace