[Sync] Replacing NULL with nullptr/null throughout sync code.

chrome/browser/sync/test/integration/bookmarks_helper.cc

Index: chrome/browser/sync/test/integration/bookmarks_helper.cc
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 5efc285b9d7a8ca3deff9df88971f8b31d5d72e8..2fc3a42c2c1c354ccdcb1e1420fc4babfe6ec472 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -142,7 +142,7 @@ class FaviconChangeObserver : public bookmarks::BookmarkModelObserver {
 // favicon is an asynchronous operation and doesn't necessarily invoke a
 // callback, this collection is used to determine if we must wait for a URL's
 // favicon to load or not.
-std::set<GURL>* urls_with_favicons_ = NULL;
+std::set<GURL>* urls_with_favicons_ = nullptr;
 
 // Returns the number of nodes of node type |node_type| in |model| whose
 // titles match the string |title|.
@@ -355,7 +355,7 @@ bool FaviconsMatch(BookmarkModel* model_a,
 // Does a deep comparison of BookmarkNode fields in |model_a| and |model_b|.
 // Returns true if they are all equal.
 bool NodesMatch(const BookmarkNode* node_a, const BookmarkNode* node_b) {
-  if (node_a == NULL || node_b == NULL)
+  if (node_a == nullptr || node_b == nullptr)
     return node_a == node_b;
   if (node_a->is_folder() != node_b->is_folder()) {
     LOG(ERROR) << "Cannot compare folder with bookmark";
@@ -496,23 +496,23 @@ const BookmarkNode* AddURL(int profile,
   if (bookmarks::GetBookmarkNodeByID(model, parent->id()) != parent) {
     LOG(ERROR) << "Node " << parent->GetTitle() << " does not belong to "
                << "Profile " << profile;
-    return NULL;
+    return nullptr;
   }
   const BookmarkNode* result =
       model->AddURL(parent, index, base::UTF8ToUTF16(title), url);
   if (!result) {
     LOG(ERROR) << "Could not add bookmark " << title << " to Profile "
                << profile;
-    return NULL;
+    return nullptr;
   }
   if (sync_datatype_helper::test()->use_verifier()) {
-    const BookmarkNode* v_parent = NULL;
+    const BookmarkNode* v_parent = nullptr;
     FindNodeInVerifier(model, parent, &v_parent);
     const BookmarkNode* v_node = GetVerifierBookmarkModel()->AddURL(
         v_parent, index, base::UTF8ToUTF16(title), url);
     if (!v_node) {
       LOG(ERROR) << "Could not add bookmark " << title << " to the verifier";
-      return NULL;
+      return nullptr;
     }
     EXPECT_TRUE(NodesMatch(v_node, result));
   }
@@ -538,7 +538,7 @@ const BookmarkNode* AddFolder(int profile,
   if (bookmarks::GetBookmarkNodeByID(model, parent->id()) != parent) {
     LOG(ERROR) << "Node " << parent->GetTitle() << " does not belong to "
                << "Profile " << profile;
-    return NULL;
+    return nullptr;
   }
   const BookmarkNode* result =
       model->AddFolder(parent, index, base::UTF8ToUTF16(title));
@@ -546,16 +546,16 @@ const BookmarkNode* AddFolder(int profile,
   if (!result) {
     LOG(ERROR) << "Could not add folder " << title << " to Profile "
                << profile;
-    return NULL;
+    return nullptr;
   }
   if (sync_datatype_helper::test()->use_verifier()) {
-    const BookmarkNode* v_parent = NULL;
+    const BookmarkNode* v_parent = nullptr;
     FindNodeInVerifier(model, parent, &v_parent);
     const BookmarkNode* v_node = GetVerifierBookmarkModel()->AddFolder(
         v_parent, index, base::UTF8ToUTF16(title));
     if (!v_node) {
       LOG(ERROR) << "Could not add folder " << title << " to the verifier";
-      return NULL;
+      return nullptr;
     }
     EXPECT_TRUE(NodesMatch(v_node, result));
   }
@@ -570,7 +570,7 @@ void SetTitle(int profile,
       << "Node " << node->GetTitle() << " does not belong to "
       << "Profile " << profile;
   if (sync_datatype_helper::test()->use_verifier()) {
-    const BookmarkNode* v_node = NULL;
+    const BookmarkNode* v_node = nullptr;
     FindNodeInVerifier(model, node, &v_node);
     GetVerifierBookmarkModel()->SetTitle(v_node, base::UTF8ToUTF16(new_title));
   }
@@ -588,11 +588,11 @@ void SetFavicon(int profile,
       << "Profile " << profile;
   ASSERT_EQ(BookmarkNode::URL, node->type()) << "Node " << node->GetTitle()
                                              << " must be a url.";
-  if (urls_with_favicons_ == NULL)
+  if (urls_with_favicons_ == nullptr)
     urls_with_favicons_ = new std::set<GURL>();
   urls_with_favicons_->insert(node->url());
   if (sync_datatype_helper::test()->use_verifier()) {
-    const BookmarkNode* v_node = NULL;
+    const BookmarkNode* v_node = nullptr;
     FindNodeInVerifier(model, node, &v_node);
     SetFaviconImpl(sync_datatype_helper::test()->verifier(),
                    v_node,
@@ -649,10 +649,10 @@ const BookmarkNode* SetURL(int profile,
   if (bookmarks::GetBookmarkNodeByID(model, node->id()) != node) {
     LOG(ERROR) << "Node " << node->GetTitle() << " does not belong to "
                << "Profile " << profile;
-    return NULL;
+    return nullptr;
   }
   if (sync_datatype_helper::test()->use_verifier()) {
-    const BookmarkNode* v_node = NULL;
+    const BookmarkNode* v_node = nullptr;
     FindNodeInVerifier(model, node, &v_node);
     if (v_node->is_url())
       GetVerifierBookmarkModel()->SetURL(v_node, new_url);
@@ -671,8 +671,8 @@ void Move(int profile,
       << "Node " << node->GetTitle() << " does not belong to "
       << "Profile " << profile;
   if (sync_datatype_helper::test()->use_verifier()) {
-    const BookmarkNode* v_new_parent = NULL;
-    const BookmarkNode* v_node = NULL;
+    const BookmarkNode* v_new_parent = nullptr;
+    const BookmarkNode* v_node = nullptr;
     FindNodeInVerifier(model, new_parent, &v_new_parent);
     FindNodeInVerifier(model, node, &v_node);
     GetVerifierBookmarkModel()->Move(v_node, v_new_parent, index);
@@ -686,7 +686,7 @@ void Remove(int profile, const BookmarkNode* parent, int index) {
       << "Node " << parent->GetTitle() << " does not belong to "
       << "Profile " << profile;
   if (sync_datatype_helper::test()->use_verifier()) {
-    const BookmarkNode* v_parent = NULL;
+    const BookmarkNode* v_parent = nullptr;
     FindNodeInVerifier(model, parent, &v_parent);
     ASSERT_TRUE(NodesMatch(parent->GetChild(index), v_parent->GetChild(index)));
     GetVerifierBookmarkModel()->Remove(v_parent->GetChild(index));
@@ -713,7 +713,7 @@ void SortChildren(int profile, const BookmarkNode* parent) {
       << "Node " << parent->GetTitle() << " does not belong to "
       << "Profile " << profile;
   if (sync_datatype_helper::test()->use_verifier()) {
-    const BookmarkNode* v_parent = NULL;
+    const BookmarkNode* v_parent = nullptr;
     FindNodeInVerifier(model, parent, &v_parent);
     GetVerifierBookmarkModel()->SortChildren(v_parent);
   }
@@ -812,7 +812,7 @@ const BookmarkNode* GetUniqueNodeByURL(int profile, const GURL& url) {
   GetBookmarkModel(profile)->GetNodesByURL(url, &nodes);
   EXPECT_EQ(1U, nodes.size());
   if (nodes.empty())
-    return NULL;
+    return nullptr;
   return nodes[0];
 }