diff options
| -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.* |