Fixed leak in ExtensionBookmarksTest.

chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc

Index: chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc b/chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc
index 5d0385975d250a1ed2d69a3098316d01e394827a..3ddb401fad9e6ac4e398f20a2516545b1dd761f5 100644
--- a/chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc
@@ -4,58 +4,62 @@
 
 #include "testing/gtest/include/gtest/gtest.h"

[sky, 2011/10/25 14:57:17]

test files follow the same include order as .cc files. So, the first include
here should be for bookmark_extension_helpers.h, newline, then sorted includes.

[Joao da Silva, 2011/10/25 15:03:22]

Done.

 
+#include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
 #include "chrome/browser/bookmarks/bookmark_extension_helpers.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 
 namespace keys = bookmark_extension_api_constants;
 
 class ExtensionBookmarksTest : public testing::Test {
  public:
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     model_.reset(new BookmarkModel(NULL));
     model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("Digg"),
                      GURL("http://www.reddit.com"));
     model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("News"),
                      GURL("http://www.foxnews.com"));
-    folder = model_->AddFolder(
+    folder_ = model_->AddFolder(
         model_->other_node(), 0, ASCIIToUTF16("outer folder"));
-    model_->AddFolder(folder, 0, ASCIIToUTF16("inner folder 1"));
-    model_->AddFolder(folder, 0, ASCIIToUTF16("inner folder 2"));
-    model_->AddURL(folder, 0, ASCIIToUTF16("Digg"), GURL("http://reddit.com"));
-    model_->AddURL(folder, 0, ASCIIToUTF16("CNet"), GURL("http://cnet.com"));
+    model_->AddFolder(folder_, 0, ASCIIToUTF16("inner folder 1"));
+    model_->AddFolder(folder_, 0, ASCIIToUTF16("inner folder 2"));
+    model_->AddURL(folder_, 0, ASCIIToUTF16("Digg"), GURL("http://reddit.com"));
+    model_->AddURL(folder_, 0, ASCIIToUTF16("CNet"), GURL("http://cnet.com"));
   }
 
   scoped_ptr<BookmarkModel> model_;
-  const BookmarkNode* folder;
+  const BookmarkNode* folder_;
 };
 TEST_F(ExtensionBookmarksTest, GetFullTreeFromRoot) {
-  DictionaryValue* tree = bookmark_extension_helpers::GetNodeDictionary(
+  scoped_ptr<DictionaryValue> tree;

[sky, 2011/10/25 14:57:17]

nit: pass the value to the constructor for all of these, eg:

scoped_ptr<DictionaryValue> tree(bookmark_extension_helpers:...

[Joao da Silva, 2011/10/25 15:03:22]

Done.

+  tree.reset(bookmark_extension_helpers::GetNodeDictionary(
       model_->other_node(),
       true,    // Recurse.
-      false);  // Not only folders.
+      false));  // Not only folders.
   ListValue* children;
   tree->GetList(keys::kChildrenKey, &children);
   ASSERT_EQ(3U, children->GetSize());
 }
 
 TEST_F(ExtensionBookmarksTest, GetFoldersOnlyFromRoot) {
-  DictionaryValue* tree = bookmark_extension_helpers::GetNodeDictionary(
+  scoped_ptr<DictionaryValue> tree;
+  tree.reset(bookmark_extension_helpers::GetNodeDictionary(
       model_->other_node(),
       true,   // Recurse.
-      true);  // Only folders.
+      true));  // Only folders.
   ListValue* children;
   tree->GetList(keys::kChildrenKey, &children);
   ASSERT_EQ(1U, children->GetSize());
 }
 
 TEST_F(ExtensionBookmarksTest, GetSubtree) {
-  DictionaryValue* tree = bookmark_extension_helpers::GetNodeDictionary(
-      folder,
+  scoped_ptr<DictionaryValue> tree;
+  tree.reset(bookmark_extension_helpers::GetNodeDictionary(
+      folder_,
       true,    // Recurse.
-      false);  // Not only folders.
+      false));  // Not only folders.
   ListValue* children;
   tree->GetList(keys::kChildrenKey, &children);
   ASSERT_EQ(4U, children->GetSize());
@@ -67,10 +71,11 @@ TEST_F(ExtensionBookmarksTest, GetSubtree) {
 }
 
 TEST_F(ExtensionBookmarksTest, GetSubtreeFoldersOnly) {
-  DictionaryValue* tree = bookmark_extension_helpers::GetNodeDictionary(
-      folder,
+  scoped_ptr<DictionaryValue> tree;
+  tree.reset(bookmark_extension_helpers::GetNodeDictionary(
+      folder_,
       true,   // Recurse.
-      true);  // Only folders.
+      true));  // Only folders.
   ListValue* children;
   tree->GetList(keys::kChildrenKey, &children);
   ASSERT_EQ(2U, children->GetSize());