summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-01 21:56:45 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-01 21:56:45 +0000
commit92ac30171a8334bc1691096abccf004ed02d0d42 (patch)
tree25fcc3902a82b34ca0a9d4a3ab07b2d9a753ed63 /chrome
parent6ae0004ffeee18919063265714bac7608b9d860a (diff)
downloadchromium_src-92ac30171a8334bc1691096abccf004ed02d0d42.zip
chromium_src-92ac30171a8334bc1691096abccf004ed02d0d42.tar.gz
chromium_src-92ac30171a8334bc1691096abccf004ed02d0d42.tar.bz2
Call superclass's TearDown to avoid leaks.
BUG=none TEST=none Review URL: http://codereview.chromium.org/150183 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm b/chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm
index e2f5a7e..a56c621 100644
--- a/chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm
+++ b/chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm
@@ -20,8 +20,6 @@ const std::string host1 = "host1";
class BlockedPopupContainerControllerTest : public RenderViewHostTestHarness {
public:
- CocoaTestHelper cocoa_helper_; // Inits Cocoa, creates window, etc...
-
virtual void SetUp() {
RenderViewHostTestHarness::SetUp();
container_ = BlockedPopupContainer::Create(contents(), profile());
@@ -34,9 +32,10 @@ class BlockedPopupContainerControllerTest : public RenderViewHostTestHarness {
virtual void TearDown() {
// This will also signal the Cocoa controller to delete itself with a
- // Destroy() mesage to the bridge.
+ // Destroy() mesage to the bridge. It also clears out the association with
+ // |contents_|.
container_->Destroy();
- contents_->set_blocked_popup_container(NULL);
+ RenderViewHostTestHarness::TearDown();
}
TabContents* BuildTabContents() {