[Sync] Replaced ASSERT/EXPECT_TRUE/FALSE with expected/actual checks.

components/sync/engine_impl/syncer_unittest.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/engine_impl/syncer.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 437 matching lines @@
               entry.PutServerParentId(trans.root_id());
               break;
             default:
               FAIL() << "Bad value in CommitOrderingTest list";
           }
         }
         test++;
       }
     }
     EXPECT_TRUE(SyncShareNudge());
-    ASSERT_TRUE(expected_positions.size() ==
-                mock_server_->committed_ids().size());
+    ASSERT_EQ(expected_positions.size(), mock_server_->committed_ids().size());
     // If this test starts failing, be aware other sort orders could be valid.
     for (size_t i = 0; i < expected_positions.size(); ++i) {
       SCOPED_TRACE(i);
       EXPECT_EQ(1u, expected_positions.count(i));
       EXPECT_EQ(expected_positions[i], mock_server_->committed_ids()[i]);
     }
   }
 
   CommitCounters GetCommitCounters(ModelType type) {
     return debug_info_cache_.GetLatestCommitCounters(type);
@@ skipping 1474 matching lines @@
                   GetOnlyEntryWithName(&rtrans, parent.GetId(), parent2_name));
     ASSERT_TRUE(parent2.good());
     EXPECT_TRUE(parent2.GetId().ServerKnows());
 
     // Id changed on commit, so this should fail.
     Entry local_parent2_id_entry(&rtrans, GET_BY_ID, parent2_local_id);
     ASSERT_FALSE(local_parent2_id_entry.good());
 
     Entry entry_b(&rtrans, GET_BY_HANDLE, meta_handle_b);
     EXPECT_TRUE(entry_b.GetId().ServerKnows());
-    EXPECT_TRUE(parent2.GetId() == entry_b.GetParentId());
+    EXPECT_EQ(parent2.GetId(), entry_b.GetParentId());
   }
 }
 
 TEST_F(SyncerTest, UpdateWithZeroLengthName) {
   // One illegal update
   mock_server_->AddUpdateDirectory(1, 0, std::string(), 1, 10,
                                    foreign_cache_guid(), "-1");
   // And one legal one that we're going to delete.
   mock_server_->AddUpdateDirectory(2, 0, "FOO", 1, 10, foreign_cache_guid(),
                                    "-2");
@@ skipping 133 matching lines @@
     EXPECT_FALSE(still_a_dir.GetIsUnappliedUpdate());
     EXPECT_EQ(10u, still_a_dir.GetBaseVersion());
     EXPECT_EQ(10u, still_a_dir.GetServerVersion());
     EXPECT_TRUE(still_a_dir.GetIsDir());
 
     Entry rename(&trans, GET_BY_ID, ids_.FromNumber(1));
     ASSERT_TRUE(rename.good());
     EXPECT_EQ(root, rename.GetParentId());
     EXPECT_EQ("new_name", rename.GetNonUniqueName());
     EXPECT_FALSE(rename.GetIsUnappliedUpdate());
-    EXPECT_TRUE(ids_.FromNumber(1) == rename.GetId());
+    EXPECT_EQ(ids_.FromNumber(1), rename.GetId());
     EXPECT_EQ(20u, rename.GetBaseVersion());
 
     Entry name_clash(&trans, GET_BY_ID, ids_.FromNumber(2));
     ASSERT_TRUE(name_clash.good());
     EXPECT_EQ(root, name_clash.GetParentId());
-    EXPECT_TRUE(ids_.FromNumber(2) == name_clash.GetId());
+    EXPECT_EQ(ids_.FromNumber(2), name_clash.GetId());
     EXPECT_EQ(10u, name_clash.GetBaseVersion());
     EXPECT_EQ("in_root", name_clash.GetNonUniqueName());
 
     Entry ignored_old_version(&trans, GET_BY_ID, ids_.FromNumber(4));
     ASSERT_TRUE(ignored_old_version.good());
     EXPECT_EQ("newer_version", ignored_old_version.GetNonUniqueName());
     EXPECT_FALSE(ignored_old_version.GetIsUnappliedUpdate());
     EXPECT_EQ(20u, ignored_old_version.GetBaseVersion());
 
     Entry circular_parent_issue(&trans, GET_BY_ID, ids_.FromNumber(5));
@@ skipping 3716 matching lines @@
     EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id);
     EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count);
     EXPECT_EQ(4U, final_monitor_records["xyz"].bookmark_write_count);
   } else {
     EXPECT_TRUE(final_monitor_records.empty())
         << "Should not restore records after successful bookmark commit.";
   }
 }
 
 }  // namespace syncer