Cleanup and minor refactoring of LogDnsClient

components/certificate_transparency/log_dns_client_unittest.cc

Index: components/certificate_transparency/log_dns_client_unittest.cc
diff --git a/components/certificate_transparency/log_dns_client_unittest.cc b/components/certificate_transparency/log_dns_client_unittest.cc
index 819d998ad13d4e867d46b62e853ac3224d3ffb31..51397c6ca644aec7d81d8995df300eec28543b21 100644
--- a/components/certificate_transparency/log_dns_client_unittest.cc
+++ b/components/certificate_transparency/log_dns_client_unittest.cc
@@ -287,12 +287,11 @@ TEST_P(LogDnsClientTest, QueryAuditProof) {
 
   net::ct::MerkleAuditProof proof;
   ASSERT_THAT(QueryAuditProof("ct.test", kLeafHashes[0], 999999, &proof),
               IsOk());
   EXPECT_THAT(proof.leaf_index, Eq(123456u));
-  // TODO(robpercival): Enable this once MerkleAuditProof has tree_size.
-  // EXPECT_THAT(proof.tree_size, Eq(999999));
+  EXPECT_THAT(proof.tree_size, Eq(999999u));
   EXPECT_THAT(proof.nodes, Eq(audit_proof));
 }
 
 TEST_P(LogDnsClientTest, QueryAuditProofHandlesResponsesWithShortAuditPaths) {
   const std::vector<std::string> audit_proof = GetSampleAuditProof(20);
@@ -323,12 +322,11 @@ TEST_P(LogDnsClientTest, QueryAuditProofHandlesResponsesWithShortAuditPaths) {
 
   net::ct::MerkleAuditProof proof;
   ASSERT_THAT(QueryAuditProof("ct.test", kLeafHashes[0], 999999, &proof),
               IsOk());
   EXPECT_THAT(proof.leaf_index, Eq(123456u));
-  // TODO(robpercival): Enable this once MerkleAuditProof has tree_size.
-  // EXPECT_THAT(proof.tree_size, Eq(999999));
+  EXPECT_THAT(proof.tree_size, Eq(999999u));
   EXPECT_THAT(proof.nodes, Eq(audit_proof));
 }
 
 TEST_P(LogDnsClientTest,
        QueryAuditProofReportsThatAuditProofQnameDoesNotExist) {
@@ -568,12 +566,11 @@ TEST_P(LogDnsClientTest, AdoptsLatestDnsConfigMidQuery) {
 
   // Wait for the query to complete, then check that it was successful.
   // The DNS config should be updated during this time.
   ASSERT_THAT(callback.WaitForResult(), IsOk());
   EXPECT_THAT(proof.leaf_index, Eq(123456u));
-  // TODO(robpercival): Enable this once MerkleAuditProof has tree_size.
-  // EXPECT_THAT(proof.tree_size, Eq(999999));
+  EXPECT_THAT(proof.tree_size, Eq(999999u));
   EXPECT_THAT(proof.nodes, Eq(audit_proof));
 
   // Check that the DNS config change was adopted.
   ASSERT_EQ(123, dns_client->GetConfig()->attempts);
 }
@@ -652,12 +649,11 @@ TEST_P(LogDnsClientTest, CanPerformQueriesInParallel) {
     net::TestCompletionCallback& callback = callbacks[i];
 
     SCOPED_TRACE(testing::Message() << "callbacks[" << i << "]");
     EXPECT_THAT(callback.WaitForResult(), IsOk());
     EXPECT_THAT(proofs[i].leaf_index, Eq(kLeafIndices[i]));
-    // TODO(robpercival): Enable this once MerkleAuditProof has tree_size.
-    // EXPECT_THAT(proofs[i].tree_size, kTreeSizes[i]);
+    EXPECT_THAT(proofs[i].tree_size, Eq(kTreeSizes[i]));
     EXPECT_THAT(proofs[i].nodes, Eq(audit_proofs[i]));
   }
 }
 
 TEST_P(LogDnsClientTest, CanBeThrottledToOneQueryAtATime) {
@@ -702,12 +698,11 @@ TEST_P(LogDnsClientTest, CanBeThrottledToOneQueryAtATime) {
               IsError(net::ERR_TEMPORARILY_THROTTLED));
 
   // Check that the first query succeeded.
   EXPECT_THAT(callback1.WaitForResult(), IsOk());
   EXPECT_THAT(proof1.leaf_index, Eq(123456u));
-  // TODO(robpercival): Enable this once MerkleAuditProof has tree_size.
-  // EXPECT_THAT(proof1.tree_size, Eq(999999));
+  EXPECT_THAT(proof1.tree_size, Eq(999999u));
   EXPECT_THAT(proof1.nodes, Eq(audit_proof));
 
   // Try a third query, which should succeed now that the first is finished.
   ASSERT_TRUE(
       mock_dns_.ExpectLeafIndexRequestAndResponse(kLeafIndexQnames[2], 666));
@@ -728,12 +723,11 @@ TEST_P(LogDnsClientTest, CanBeThrottledToOneQueryAtATime) {
               IsError(net::ERR_IO_PENDING));
 
   // Check that the third query succeeded.
   EXPECT_THAT(callback3.WaitForResult(), IsOk());
   EXPECT_THAT(proof3.leaf_index, Eq(666u));
-  // TODO(robpercival): Enable this once MerkleAuditProof has tree_size.
-  // EXPECT_THAT(proof3.tree_size, Eq(999999));
+  EXPECT_THAT(proof3.tree_size, Eq(999999u));
   EXPECT_THAT(proof3.nodes, Eq(audit_proof));
 }
 
 TEST_P(LogDnsClientTest, NotifiesWhenNoLongerThrottled) {
   const std::vector<std::string> audit_proof = GetSampleAuditProof(20);