| Index: components/sync_bookmarks/bookmark_model_associator.cc
|
| diff --git a/components/sync_bookmarks/bookmark_model_associator.cc b/components/sync_bookmarks/bookmark_model_associator.cc
|
| index cc8532c4c1ca68c6fb912a69c33aea08129a1bb2..8db093d1e03416f36dd40831f0cad769ab69a077 100644
|
| --- a/components/sync_bookmarks/bookmark_model_associator.cc
|
| +++ b/components/sync_bookmarks/bookmark_model_associator.cc
|
| @@ -74,7 +74,7 @@ class BookmarkNodeFinder {
|
| explicit BookmarkNodeFinder(const BookmarkNode* parent_node);
|
|
|
| // Finds the bookmark node that matches the given url, title and folder
|
| - // attribute. Returns the matching node if one exists; NULL otherwise.
|
| + // attribute. Returns the matching node if one exists; null otherwise.
|
| // If there are multiple matches then a node with ID matching |preferred_id|
|
| // is returned; otherwise the first matching node is returned.
|
| // If a matching node is found, it's removed for further matches.
|
| @@ -340,7 +340,7 @@ int64_t BookmarkModelAssociator::GetSyncIdFromChromeId(const int64_t& node_id) {
|
| const BookmarkNode* BookmarkModelAssociator::GetChromeNodeFromSyncId(
|
| int64_t sync_id) {
|
| SyncIdToBookmarkNodeMap::const_iterator iter = id_map_inverse_.find(sync_id);
|
| - return iter == id_map_inverse_.end() ? NULL : iter->second;
|
| + return iter == id_map_inverse_.end() ? nullptr : iter->second;
|
| }
|
|
|
| bool BookmarkModelAssociator::InitSyncNodeFromChromeId(
|
|
|