Refactor chrome.bookmarks API to use JSON schema compiler.

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 50850f190f9bc6c3bc147390052be7698c2772d1..b30537ac05963fc90e3442e48312e85d1c201b11 100644
--- a/chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc
@@ -9,10 +9,13 @@
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/common/extensions/api/bookmarks.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace keys = bookmark_extension_api_constants;
 
+using extensions::api::bookmarks::BookmarkTreeNode;
+
 class ExtensionBookmarksTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
@@ -33,55 +36,43 @@ class ExtensionBookmarksTest : public testing::Test {
   const BookmarkNode* folder_;
 };
 TEST_F(ExtensionBookmarksTest, GetFullTreeFromRoot) {
-  scoped_ptr<DictionaryValue> tree(
-      bookmark_extension_helpers::GetNodeDictionary(
+  scoped_ptr<BookmarkTreeNode> tree(
+      bookmark_extension_helpers::GetBookmarkTreeNode(
           model_->other_node(),
           true,    // Recurse.
           false));  // Not only folders.
-  ListValue* children;
-  tree->GetList(keys::kChildrenKey, &children);
-  ASSERT_EQ(3U, children->GetSize());
+  ASSERT_EQ(3U, tree->children->size());
 }
 
 TEST_F(ExtensionBookmarksTest, GetFoldersOnlyFromRoot) {
-  scoped_ptr<DictionaryValue> tree(
-      bookmark_extension_helpers::GetNodeDictionary(
+  scoped_ptr<BookmarkTreeNode> tree(
+      bookmark_extension_helpers::GetBookmarkTreeNode(
           model_->other_node(),
           true,   // Recurse.
           true));  // Only folders.
-  ListValue* children;
-  tree->GetList(keys::kChildrenKey, &children);
-  ASSERT_EQ(1U, children->GetSize());
+  ASSERT_EQ(1U, tree->children->size());
 }
 
 TEST_F(ExtensionBookmarksTest, GetSubtree) {
-  scoped_ptr<DictionaryValue> tree(
-      bookmark_extension_helpers::GetNodeDictionary(
+  scoped_ptr<BookmarkTreeNode> tree(
+      bookmark_extension_helpers::GetBookmarkTreeNode(
           folder_,
           true,    // Recurse.
           false));  // Not only folders.
-  ListValue* children;
-  tree->GetList(keys::kChildrenKey, &children);
-  ASSERT_EQ(4U, children->GetSize());
-  DictionaryValue* digg;
-  ASSERT_TRUE(children->GetDictionary(1, &digg));
-  std::string title;
-  digg->GetString(keys::kTitleKey, &title);
-  ASSERT_EQ("Digg", title);
+  ASSERT_EQ(4U, tree->children->size());
+  linked_ptr<BookmarkTreeNode> digg = tree->children->at(1);
+  ASSERT_TRUE(digg.get());
+  ASSERT_EQ("Digg", digg->title);
 }
 
 TEST_F(ExtensionBookmarksTest, GetSubtreeFoldersOnly) {
-  scoped_ptr<DictionaryValue> tree(
-      bookmark_extension_helpers::GetNodeDictionary(
+  scoped_ptr<BookmarkTreeNode> tree(
+      bookmark_extension_helpers::GetBookmarkTreeNode(
           folder_,
           true,   // Recurse.
           true));  // Only folders.
-  ListValue* children;
-  tree->GetList(keys::kChildrenKey, &children);
-  ASSERT_EQ(2U, children->GetSize());
-  DictionaryValue* inner_folder;
-  ASSERT_TRUE(children->GetDictionary(1, &inner_folder));
-  std::string title;
-  inner_folder->GetString(keys::kTitleKey, &title);
-  ASSERT_EQ("inner folder 1", title);
+  ASSERT_EQ(2U, tree->children->size());
+  linked_ptr<BookmarkTreeNode> inner_folder = tree->children->at(1);
+  ASSERT_TRUE(inner_folder.get());
+  ASSERT_EQ("inner folder 1", inner_folder->title);
 }