Fix memory leaks in TopSites.

chrome/browser/history/top_sites.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/history/top_sites.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
@@ skipping 641 matching lines @@
   Value* dummy = Value::CreateNullValue();
   blacklist_->SetWithoutPathExpansion(GetURLHash(url), dummy);
 }
 
 bool TopSites::IsBlacklisted(const GURL& url) {
   bool result = blacklist_->HasKey(GetURLHash(url));
   return result;
 }
 
 void TopSites::RemoveBlacklistedURL(const GURL& url) {
-  Value* dummy = NULL;
-  blacklist_->RemoveWithoutPathExpansion(GetURLHash(url), &dummy);
+  blacklist_->RemoveWithoutPathExpansion(GetURLHash(url), NULL);
 }
 
 void TopSites::ClearBlacklistedURLs() {
   blacklist_->Clear();
 }
 
 void TopSites::AddPinnedURL(const GURL& url, size_t pinned_index) {
   GURL old;
   if (GetPinnedURLAtIndex(pinned_index, &old)) {
     RemovePinnedURL(old);
   }
 
   if (IsURLPinned(url)) {
     RemovePinnedURL(url);
   }
 
   Value* index = Value::CreateIntegerValue(pinned_index);
   pinned_urls_->SetWithoutPathExpansion(GetURLString(url), 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) {
   int tmp;
   bool result = pinned_urls_->GetIntegerWithoutPathExpansion(
       GetURLString(url), &tmp);
   *index = static_cast<size_t>(tmp);
   return result;
 }
 
@@ skipping 126 matching lines @@
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
   db_.reset(new TopSitesDatabaseImpl());
   file_util::Delete(db_path_, false);
   if (!db_->Init(db_path_)) {
     NOTREACHED() << "Failed to initialize database.";
     return;
   }
 }
 
 }  // namespace history