diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 00:24:34 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 00:24:34 +0000 |
| commit | 73a1ee074721d4f19d46b3f446d6e41228187a1d (patch) | |
| tree | 7fdbb34593e1c84b7d39c191ecc8e5012a6892c3 | |
| parent | fd334d1fdecb40bec1efd575d959d332b6ab5e53 (diff) | |
| download | chromium_src-73a1ee074721d4f19d46b3f446d6e41228187a1d.zip chromium_src-73a1ee074721d4f19d46b3f446d6e41228187a1d.tar.gz chromium_src-73a1ee074721d4f19d46b3f446d6e41228187a1d.tar.bz2 | |
Fixes leaks in TreeViewViews test.
BUG=109638
TEST=none
TBR=ben@chromium.org
R=ben@chromium.org
Review URL: http://codereview.chromium.org/9152016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116971 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 6 | ||||
| -rw-r--r-- | ui/views/controls/tree/tree_view_views_unittest.cc | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index 084e5e5b..acc6011 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -1771,9 +1771,3 @@ Heapcheck:Leak fun:AutofillProfileSyncableServiceTest::SetUp } -{ - bug_109638 - Heapcheck:Leak - ... - fun:views::TreeViewViewsTest::Add -} diff --git a/ui/views/controls/tree/tree_view_views_unittest.cc b/ui/views/controls/tree/tree_view_views_unittest.cc index 281e105..b845ce8 100644 --- a/ui/views/controls/tree/tree_view_views_unittest.cc +++ b/ui/views/controls/tree/tree_view_views_unittest.cc @@ -246,19 +246,19 @@ TEST_F(TreeViewViewsTest, TreeNodesRemoved) { // effect the tree. tree_.Expand(GetNodeByTitle("b")); tree_.Collapse(GetNodeByTitle("b")); - model_.Remove(GetNodeByTitle("b1")->parent(), GetNodeByTitle("b1")); + delete model_.Remove(GetNodeByTitle("b1")->parent(), GetNodeByTitle("b1")); EXPECT_EQ("root [a b c]", TreeViewContentsAsString()); EXPECT_EQ("root", GetSelectedNodeTitle()); EXPECT_EQ(4, GetRowCount()); // Remove 'b'. - model_.Remove(GetNodeByTitle("b")->parent(), GetNodeByTitle("b")); + delete model_.Remove(GetNodeByTitle("b")->parent(), GetNodeByTitle("b")); EXPECT_EQ("root [a c]", TreeViewContentsAsString()); EXPECT_EQ("root", GetSelectedNodeTitle()); EXPECT_EQ(3, GetRowCount()); // Remove 'c11', shouldn't visually change anything. - model_.Remove(GetNodeByTitle("c11")->parent(), GetNodeByTitle("c11")); + delete model_.Remove(GetNodeByTitle("c11")->parent(), GetNodeByTitle("c11")); EXPECT_EQ("root [a c]", TreeViewContentsAsString()); EXPECT_EQ("root", GetSelectedNodeTitle()); EXPECT_EQ(3, GetRowCount()); @@ -266,7 +266,7 @@ TEST_F(TreeViewViewsTest, TreeNodesRemoved) { // Select 'c1', remove 'c' and make sure selection changes. tree_.SetSelectedNode(GetNodeByTitle("c1")); EXPECT_EQ("c1", GetSelectedNodeTitle()); - model_.Remove(GetNodeByTitle("c")->parent(), GetNodeByTitle("c")); + delete model_.Remove(GetNodeByTitle("c")->parent(), GetNodeByTitle("c")); EXPECT_EQ("root [a]", TreeViewContentsAsString()); EXPECT_EQ("root", GetSelectedNodeTitle()); EXPECT_EQ(2, GetRowCount()); @@ -276,7 +276,7 @@ TEST_F(TreeViewViewsTest, TreeNodesRemoved) { // selection should change to 'a'. Add(GetNodeByTitle("root"), 1, "b"); tree_.SetSelectedNode(GetNodeByTitle("b")); - model_.Remove(GetNodeByTitle("b")->parent(), GetNodeByTitle("b")); + delete model_.Remove(GetNodeByTitle("b")->parent(), GetNodeByTitle("b")); EXPECT_EQ("root [a]", TreeViewContentsAsString()); EXPECT_EQ("a", GetSelectedNodeTitle()); EXPECT_EQ(1, GetRowCount()); |