Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder."

chrome/browser/extensions/extension_bookmark_helpers.cc

 // Copyright (c) 2011 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_bookmark_helpers.h"
 
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
@@ skipping 32 matching lines @@
     // seconds.
     dict->SetDouble(keys::kDateAddedKey,
                     floor(node->date_added().ToDoubleT() * 1000));
   }
 
   if (recurse && node->is_folder()) {
     int childCount = node->child_count();
     ListValue* children = new ListValue();
     for (int i = 0; i < childCount; ++i) {
       const BookmarkNode* child = node->GetChild(i);
-      if (!only_folders || child->is_folder()) {
+      if (child->IsVisible() && (!only_folders || child->is_folder())) {
         DictionaryValue* dict = GetNodeDictionary(child, true, only_folders);
         children->Append(dict);
       }
     }
     dict->Set(keys::kChildrenKey, children);
   }
   return dict;
 }
 
 void AddNode(const BookmarkNode* node,
              ListValue* list,
              bool recurse,
              bool only_folders) {
-  DictionaryValue* dict = GetNodeDictionary(node, recurse, only_folders);
-  list->Append(dict);
+  if (node->IsVisible()) {
+    DictionaryValue* dict = GetNodeDictionary(node, recurse, only_folders);
+    list->Append(dict);
+  }
 }
 
 // Add a JSON representation of |node| to the JSON |list|.
 void AddNode(const BookmarkNode* node,
              ListValue* list,
              bool recurse) {
   return AddNode(node, list, recurse, false);
 }
 
 void AddNodeFoldersOnly(const BookmarkNode* node,
-             ListValue* list,
-             bool recurse) {
+                        ListValue* list,
+                        bool recurse) {
   return AddNode(node, list, recurse, true);
 }
 
 bool RemoveNode(BookmarkModel* model,
                 int64 id,
                 bool recursive,
                 std::string* error) {
   const BookmarkNode* node = model->GetNodeByID(id);
   if (!node) {
     *error = keys::kNoNodeError;
     return false;
   }
   if (node == model->root_node() ||
       node == model->other_node() ||
+      node == model->synced_node() ||
       node == model->GetBookmarkBarNode()) {
     *error = keys::kModifySpecialError;
     return false;
   }
   if (node->is_folder() && node->child_count() > 0 && !recursive) {
     *error = keys::kFolderNotEmptyError;
     return false;
   }
 
   const BookmarkNode* parent = node->parent();
   int index = parent->GetIndexOf(node);
   model->Remove(parent, index);
   return true;
 }
 
 }