summaryrefslogtreecommitdiffstats
path: root/chrome/browser/blocked_popup_container_unittest.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-03 16:47:10 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-03 16:47:10 +0000
commitbdc586d588b98b249e675b1d7c5493bb576a916e (patch)
tree9241bb3fd0a7ad7e863dbb5f926d2125b72f7f63 /chrome/browser/blocked_popup_container_unittest.cc
parent5590b304d9f814e7be2f867270e962e582a48a34 (diff)
downloadchromium_src-bdc586d588b98b249e675b1d7c5493bb576a916e.zip
chromium_src-bdc586d588b98b249e675b1d7c5493bb576a916e.tar.gz
chromium_src-bdc586d588b98b249e675b1d7c5493bb576a916e.tar.bz2
Rewrite chunks of the blocked popup container code:
* Fix an off-by-one error in menu rendering if a renderer actually sent us kImpossibleNumberOfPopups. * Be clearer and stricter about item indexes and sanity checking. Hopefully, this or the previous item fix a crash we saw (no bug filed). * Add notice support (as much as exists for Windows) to GTK and Mac. * Make the implementations in the three platforms mirror each other a little more precisely. * Fix (expected, actual) mis-ordering in Mac unittest. BUG=none TEST=none Review URL: http://codereview.chromium.org/260005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/blocked_popup_container_unittest.cc')
-rw-r--r--chrome/browser/blocked_popup_container_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/blocked_popup_container_unittest.cc b/chrome/browser/blocked_popup_container_unittest.cc
index cedf1c8..e57fec4 100644
--- a/chrome/browser/blocked_popup_container_unittest.cc
+++ b/chrome/browser/blocked_popup_container_unittest.cc
@@ -96,6 +96,6 @@ TEST_F(BlockedPopupContainerTest, BasicCase) {
EXPECT_EQ(container_->GetBlockedPopupCount(), static_cast<size_t>(1));
EXPECT_EQ(container_->GetTabContentsAt(0), popup);
+ ASSERT_THAT(container_->GetHosts(), testing::Contains(host1));
EXPECT_FALSE(container_->IsHostWhitelisted(0));
- EXPECT_THAT(container_->GetHosts(), testing::Contains(host1));
}