From ff7483367d17ef02612f6ba441ebc7b4d8a71590 Mon Sep 17 00:00:00 2001
From: "rohitrao@chromium.org"
<rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 17 Dec 2009 20:02:36 +0000
Subject: [Mac] Fix an object destruction ordering problem in
TabStripControllerTest.
BUG=http://crbug.com/30397
TEST=Valgrind should still be happy.
Review URL: http://codereview.chromium.org/502020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34864 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/browser/cocoa/tab_strip_controller_unittest.mm | 4 ++++
chrome/test/data/valgrind/unit_tests.gtest_mac.txt | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
(limited to 'chrome')
diff --git a/chrome/browser/cocoa/tab_strip_controller_unittest.mm b/chrome/browser/cocoa/tab_strip_controller_unittest.mm
index 76d5da3..d68491c 100644
--- a/chrome/browser/cocoa/tab_strip_controller_unittest.mm
+++ b/chrome/browser/cocoa/tab_strip_controller_unittest.mm
@@ -104,6 +104,10 @@ class TabStripControllerTest : public CocoaTest {
virtual void TearDown() {
browser_helper_.CloseBrowserWindow();
+ // The call to CocoaTest::TearDown() deletes the Browser and TabStripModel
+ // objects, so we first have to delete the controller, which refers to them.
+ controller_.reset(nil);
+ model_ = NULL;
CocoaTest::TearDown();
}
diff --git a/chrome/test/data/valgrind/unit_tests.gtest_mac.txt b/chrome/test/data/valgrind/unit_tests.gtest_mac.txt
index bfd3bc9..30c4d03 100644
--- a/chrome/test/data/valgrind/unit_tests.gtest_mac.txt
+++ b/chrome/test/data/valgrind/unit_tests.gtest_mac.txt
@@ -42,6 +42,6 @@ PrefsControllerTest.SwitchToPage
RenderViewTest.OnPrintPages
RenderViewTest.Print*
# See http://crbug.com/30397.
-TabStripControllerTest.*
+TabStripControllerTest.AddRemoveTabs
# See http://crbug.com/30398.
TaskManagerWindowControllerTest.*
--
cgit v1.1