diff options
| author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 20:02:36 +0000 |
|---|---|---|
| committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 20:02:36 +0000 |
| commit | ff7483367d17ef02612f6ba441ebc7b4d8a71590 (patch) | |
| tree | cb951a21e5db2aaa6e0c9b6f4385119e982b3ca0 /chrome | |
| parent | b0f5f23da2bbc6f60afe0b51b669a397903f6ee8 (diff) | |
| download | chromium_src-ff7483367d17ef02612f6ba441ebc7b4d8a71590.zip chromium_src-ff7483367d17ef02612f6ba441ebc7b4d8a71590.tar.gz chromium_src-ff7483367d17ef02612f6ba441ebc7b4d8a71590.tar.bz2 | |
[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
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/tab_strip_controller_unittest.mm | 4 | ||||
| -rw-r--r-- | chrome/test/data/valgrind/unit_tests.gtest_mac.txt | 2 |
2 files changed, 5 insertions, 1 deletions
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.* |