Bookmark permanent nodes' visibility is embedder's business.

components/sync_bookmarks/bookmark_model_associator.cc

 // Copyright 2012 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 "components/sync_bookmarks/bookmark_model_associator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/format_macros.h"
@@ skipping 353 matching lines @@
       weak_factory_(this) {
   DCHECK(bookmark_model_);
   DCHECK(user_share_);
   DCHECK(unrecoverable_error_handler_);
 }
 
 BookmarkModelAssociator::~BookmarkModelAssociator() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-void BookmarkModelAssociator::UpdatePermanentNodeVisibility() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(bookmark_model_->loaded());
-
-  BookmarkNode::Type bookmark_node_types[] = {
-    BookmarkNode::BOOKMARK_BAR,
-    BookmarkNode::OTHER_NODE,
-    BookmarkNode::MOBILE,
-  };
-  for (size_t i = 0; i < arraysize(bookmark_node_types); ++i) {
-    int64 id = bookmark_model_->PermanentNode(bookmark_node_types[i])->id();
-    bookmark_model_->SetPermanentNodeVisible(
-      bookmark_node_types[i],
-      id_map_.find(id) != id_map_.end());
-  }
-
-  // Note: the root node may have additional extra nodes. Currently their
-  // visibility is not affected by sync.
-}
-
 syncer::SyncError BookmarkModelAssociator::DisassociateModels() {
   id_map_.clear();
   id_map_inverse_.clear();
   dirty_associations_sync_ids_.clear();
   return syncer::SyncError();
 }
 
 int64 BookmarkModelAssociator::GetSyncIdFromChromeId(const int64& node_id) {
   BookmarkIdToSyncIdMap::const_iterator iter = id_map_.find(node_id);
   return iter == id_map_.end() ? syncer::kInvalidId : iter->second;
@@ skipping 26 matching lines @@
   DCHECK(id_map_.find(node_id) == id_map_.end());
   DCHECK(id_map_inverse_.find(sync_id) == id_map_inverse_.end());
   id_map_[node_id] = sync_id;
   id_map_inverse_[sync_id] = node;
 }
 
 void BookmarkModelAssociator::Associate(const BookmarkNode* node,
                                         const syncer::BaseNode& sync_node) {
   AddAssociation(node, sync_node.GetId());
 
-  // TODO(stanisc): crbug.com/456876: consider not doing this on every single

[noyau (Ping after 24h), 2015/11/18 16:49:15]

Please add this bug number to the bug description so the bug is tagged when this
lands.

-  // association.
-  UpdatePermanentNodeVisibility();
-
   // The same check exists in PersistAssociations. However it is better to
   // do the check earlier to avoid the cost of decrypting nodes again
   // in PersistAssociations.
   if (node->id() != sync_node.GetExternalId()) {
     dirty_associations_sync_ids_.insert(sync_node.GetId());
     PostPersistAssociationsTask();
   }
 }
 
 void BookmarkModelAssociator::Disassociate(int64 sync_id) {
@@ skipping 732 matching lines @@
                                  syncer::BOOKMARKS);
       } else {
         context->set_native_model_sync_state(BEHIND);
       }
     }
   }
   return syncer::SyncError();
 }
 
 }  // namespace browser_sync