Push bookmarks.remove/removeAll polymorphism into c++. fix bookmarks id schema issues

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 340 matching lines @@
   for (; i != nodes.end(); ++i) {
     const BookmarkNode* node = *i;
     ExtensionBookmarks::AddNode(node, json, false);
   }
 
   result_.reset(json);
   return true;
 }
 
 bool RemoveBookmarkFunction::RunImpl() {
-  EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_LIST));
-  const ListValue* args = static_cast<const ListValue*>(args_);
   bool recursive = false;
-  EXTENSION_FUNCTION_VALIDATE(args->GetBoolean(1, &recursive));
+  if (name() ==
+      extension_bookmarks_module_constants::kRemoveBookmarkTreeFunction)
+    recursive = true;
 
   BookmarkModel* model = profile()->GetBookmarkModel();
   int64 id;
   std::string id_string;
-  if (args->GetString(0, &id_string) && StringToInt64(id_string, &id)) {
+  if (args_->IsType(Value::TYPE_STRING) &&
+      args_->GetAsString(&id_string) &&
+      StringToInt64(id_string, &id)) {
     return ExtensionBookmarks::RemoveNode(model, id, recursive, &error_);
   } else {
-    ListValue* ids;
-    EXTENSION_FUNCTION_VALIDATE(args->GetList(0, &ids));
+    EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_LIST));
+    ListValue* ids = static_cast<ListValue*>(args_);
     size_t count = ids->GetSize();
     EXTENSION_FUNCTION_VALIDATE(count > 0);
     for (size_t i = 0; i < count; ++i) {
       EXTENSION_FUNCTION_VALIDATE(ids->GetString(i, &id_string));
       if (!GetBookmarkIdAsInt64(id_string, &id))
         return false;
       if (!ExtensionBookmarks::RemoveNode(model, id, recursive, &error_))
         return false;
     }
     return true;
@@ skipping 86 matching lines @@
       node == model->GetBookmarkBarNode()) {
     error_ = keys::kModifySpecialError;
     return false;
   }
 
   const BookmarkNode* parent;
   if (!destination->HasKey(keys::kParentIdKey)) {
     // Optional, defaults to current parent.
     parent = node->GetParent();
   } else {
-    int parentId;
-    EXTENSION_FUNCTION_VALIDATE(destination->GetInteger(keys::kParentIdKey,
-                                                        &parentId));
+    std::string parentId_string;
+    EXTENSION_FUNCTION_VALIDATE(destination->GetString(keys::kParentIdKey,
+        &parentId_string));
+    int64 parentId;
+    if (!GetBookmarkIdAsInt64(parentId_string, &parentId))
+      return false;
+
     parent = model->GetNodeByID(parentId);
   }
   if (!parent) {
     error_ = keys::kNoParentError;
     // TODO(erikkay) return an error message.
     return false;
   }
   if (parent == model->root_node()) {
     error_ = keys::kModifySpecialError;
     return false;
@@ skipping 35 matching lines @@
   }
   if (node == model->root_node() ||
       node == model->other_node() ||
       node == model->GetBookmarkBarNode()) {
     error_ = keys::kModifySpecialError;
     return false;
   }
   model->SetTitle(node, title);
   return true;
 }