Set a RemoteID when one is missing.

This CL accomodates the case were a node has no remote ID but the key for the
remote ID is present in its metadata map.

BUG=420612

Review URL: https://codereview.chromium.org/636883003

Cr-Commit-Position: refs/heads/master@{#298552}

1 files changed, 2 insertions, 3 deletions

diff --git a/components/enhanced_bookmarks/metadata_accessor.cc b/components/enhanced_bookmarks/metadata_accessor.cc
index cfcc9be..e2013b9 100644
--- a/components/enhanced_bookmarks/metadata_accessor.cc
+++ b/components/enhanced_bookmarks/metadata_accessor.cc
@@ -82,10 +82,9 @@ std::string RemoteIdFromBookmark(BookmarkModel* bookmark_model,
     return SetRemoteIdOnBookmark(bookmark_model, node);
 
   BookmarkNode::MetaInfoMap::const_iterator it = map->find(kIdDataKey);
-  if (it == map->end())
+  if (it == map->end() || it->second.empty())
     return SetRemoteIdOnBookmark(bookmark_model, node);
 
-  DCHECK(it->second.length());
   return it->second;
 }
 
@@ -102,7 +101,7 @@ std::string DescriptionFromBookmark(const BookmarkNode* node) {
 
   // First, look for a custom note set by the user.
   BookmarkNode::MetaInfoMap::const_iterator it = map->find(kNoteKey);
-  if (it != map->end() && it->second != "")
+  if (it != map->end() && !it->second.empty())
     return it->second;
 
   // If none are present, return the snippet.