more bookmark tests, plus fix a couple of API bugs

chrome/browser/extensions/extension_bookmarks_module.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/extensions/extension_bookmarks_module.h"
 
 #include "base/json_writer.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 42 matching lines @@
     }
 
     if (recurse) {
       int childCount = node->GetChildCount();
       ListValue* children = new ListValue();
       for (int i = 0; i < childCount; ++i) {
         const BookmarkNode* child = node->GetChild(i);
         DictionaryValue* dict = GetNodeDictionary(child, true);
         children->Append(dict);
       }
-      dict->Set(keys::kChildrenKey, children);
+      if (node->is_folder())
+        dict->Set(keys::kChildrenKey, children);
     }
     return dict;
   }
 
   // Add a JSON representation of |node| to the JSON |list|.
   static void AddNode(const BookmarkNode* node, ListValue* list, bool recurse) {
     DictionaryValue* dict = GetNodeDictionary(node, recurse);
     list->Append(dict);
   }
 
@@ skipping 434 matching lines @@
                                                         &index));
     if (index > parent->GetChildCount() || index < 0) {
       error_ = keys::kInvalidIndexError;
       return false;
     }
   } else {
     index = parent->GetChildCount();
   }
 
   model->Move(node, parent, index);
+
+  DictionaryValue* ret = ExtensionBookmarks::GetNodeDictionary(node, false);
+  result_.reset(ret);
+
   return true;
 }
 
-bool SetBookmarkTitleFunction::RunImpl() {
-  EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_DICTIONARY));
-  DictionaryValue* json = static_cast<DictionaryValue*>(args_);
-
+bool UpdateBookmarkFunction::RunImpl() {
+  EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_LIST));
+  const ListValue* args = static_cast<const ListValue*>(args_);
+  int64 id;
+  std::string id_string;
+  EXTENSION_FUNCTION_VALIDATE(args->GetString(0, &id_string));
+  if (!GetBookmarkIdAsInt64(id_string, &id))
+    return false;
+  DictionaryValue* updates;
+  EXTENSION_FUNCTION_VALIDATE(args->GetDictionary(1, &updates));
   std::wstring title;
-  json->GetString(keys::kTitleKey, &title);  // Optional (empty is clear).
+  updates->GetString(keys::kTitleKey, &title);  // Optional (empty is clear).
 
   BookmarkModel* model = profile()->GetBookmarkModel();
-  int64 id = 0;
-  std::string id_string;
-  EXTENSION_FUNCTION_VALIDATE(json->GetString(keys::kIdKey, &id_string));
-  if (!GetBookmarkIdAsInt64(id_string, &id))
-    return false;
   const BookmarkNode* node = model->GetNodeByID(id);
   if (!node) {
     error_ = keys::kNoNodeError;
     return false;
   }
   if (node == model->root_node() ||
       node == model->other_node() ||
       node == model->GetBookmarkBarNode()) {
     error_ = keys::kModifySpecialError;
     return false;
   }
   model->SetTitle(node, title);
+
+  DictionaryValue* ret = ExtensionBookmarks::GetNodeDictionary(node, false);
+  result_.reset(ret);
+
   return true;
 }