diff options
| author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 18:27:42 +0000 |
|---|---|---|
| committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 18:27:42 +0000 |
| commit | f971e4dd420220c5384537fbce97f6481ce65ed9 (patch) | |
| tree | 0d2b77feb506bc86d60bd3c5666979070c9e3a97 | |
| parent | 626cbf16a84ed4a22aaa92ed2387df5dabf1c4b4 (diff) | |
| download | chromium_src-f971e4dd420220c5384537fbce97f6481ce65ed9.zip chromium_src-f971e4dd420220c5384537fbce97f6481ce65ed9.tar.gz chromium_src-f971e4dd420220c5384537fbce97f6481ce65ed9.tar.bz2 | |
[Mac] Fix a leak in BrowserWindowCocoaTest.
BUG=http://crbug.com/30382
TEST=Valgrind mac should stay happy.
Review URL: http://codereview.chromium.org/506055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34844 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/browser_window_cocoa_unittest.mm | 8 | ||||
| -rw-r--r-- | chrome/test/data/valgrind/unit_tests.gtest_mac.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa_unittest.mm b/chrome/browser/cocoa/browser_window_cocoa_unittest.mm index c6b5ea4..4a5dd60 100644 --- a/chrome/browser/cocoa/browser_window_cocoa_unittest.mm +++ b/chrome/browser/cocoa/browser_window_cocoa_unittest.mm @@ -100,10 +100,14 @@ TEST_F(BrowserWindowCocoaTest, TestBookmarkBarVisible) { @end TEST_F(BrowserWindowCocoaTest, TestFullscreen) { - FakeController* fake_controller = [[FakeController alloc] init]; + // Wrap the FakeController in a scoped_nsobject instead of autoreleasing in + // windowWillClose: because we never actually open a window in this test (so + // windowWillClose: never gets called). + scoped_nsobject<FakeController> fake_controller( + [[FakeController alloc] init]); BrowserWindowCocoaPong *bwc = new BrowserWindowCocoaPong( browser_helper_.browser(), - (BrowserWindowController*)fake_controller); + (BrowserWindowController*)fake_controller.get()); scoped_ptr<BrowserWindowCocoaPong> scoped_bwc(bwc); EXPECT_FALSE(bwc->IsFullscreen()); diff --git a/chrome/test/data/valgrind/unit_tests.gtest_mac.txt b/chrome/test/data/valgrind/unit_tests.gtest_mac.txt index d4a4fda..bfd3bc9 100644 --- a/chrome/test/data/valgrind/unit_tests.gtest_mac.txt +++ b/chrome/test/data/valgrind/unit_tests.gtest_mac.txt @@ -27,8 +27,6 @@ RenderViewTest.MacTestCmdUp # Folowing tests do not pass memcheck test. # See http://crbug.com/30381. BookmarkMenuTest.Basics -# See http://crbug.com/30382. -BrowserWindowCocoaTest.TestFullscreen # See http://crbug.com/30384. ChromeBrowserWindowTest.DoesHideTitle # See http://crbug.com/30386. |