Fix memory leaks in TopSites.

Revert http://codereview.chromium.org/3064004

BUG=50103
TEST=memory bots, heapcheck.

Review URL: http://codereview.chromium.org/3023018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53653 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 34 deletions

diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 348ab7b..950bb2f 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -659,8 +659,7 @@ bool TopSites::IsBlacklisted(const GURL& url) {
 }
 
 void TopSites::RemoveBlacklistedURL(const GURL& url) {
-  Value* dummy = NULL;
-  blacklist_->RemoveWithoutPathExpansion(GetURLHash(url), &dummy);
+  blacklist_->RemoveWithoutPathExpansion(GetURLHash(url), NULL);
 }
 
 void TopSites::ClearBlacklistedURLs() {
@@ -682,8 +681,7 @@ void TopSites::AddPinnedURL(const GURL& url, size_t pinned_index) {
 }
 
 void TopSites::RemovePinnedURL(const GURL& url) {
-  Value* dummy = NULL;
-  pinned_urls_->RemoveWithoutPathExpansion(GetURLString(url), &dummy);
+  pinned_urls_->RemoveWithoutPathExpansion(GetURLString(url), NULL);
 }
 
 bool TopSites::GetIndexOfPinnedURL(const GURL& url, size_t* index) {
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 7d43cb0..4396117 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -929,18 +929,4 @@
    fun:URLRequest::Start
    fun:HTTPTestServer::StartGETRequest
 }
-{
-   bug_50103_a
-   Heapcheck:Leak
-   fun:Value::CreateNullValue
-   fun:history::TopSites::AddBlacklistedURL
-   fun:history::TopSitesTest_*_Test::TestBody
-}
-{
-   bug_50103_b
-   Heapcheck:Leak
-   fun:Value::CreateIntegerValue
-   fun:history::TopSites::AddPinnedURL
-   fun:history::TopSitesTest_PinnedURLs_Test::TestBody
-}
 
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index fbd57b3..304605f 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -3504,21 +3504,5 @@
    fun:_ZN9OptionsUIC1EP11TabContents
    fun:_Z8NewDOMUII9OptionsUIEP5DOMUIP11TabContentsRK4GURL
 }
-{
-   bug_50103_a
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN5Value15CreateNullValueEv
-   fun:_ZN7history8TopSites17AddBlacklistedURLERK4GURL
-   fun:_ZN7history*TopSitesTest_*_Test8TestBodyEv
-}
-{
-   bug_50103_b
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN5Value18CreateIntegerValueE*
-   fun:_ZN7history8TopSites12AddPinnedURLERK4GURL*
-   fun:_ZN7history*TopSitesTest_PinnedURLs_Test8TestBodyEv
-}