Merge LogDnsClient's QueryLeafIndex and QueryAuditProof methods

components/certificate_transparency/mock_log_dns_traffic.h

Index: components/certificate_transparency/mock_log_dns_traffic.h
diff --git a/components/certificate_transparency/mock_log_dns_traffic.h b/components/certificate_transparency/mock_log_dns_traffic.h
index f91e66824de64b4a0b1d63914ca54da1977eb80a..52421cfd884b74cf5cccfb8fb875cedd3885f4b4 100644
--- a/components/certificate_transparency/mock_log_dns_traffic.h
+++ b/components/certificate_transparency/mock_log_dns_traffic.h
@@ -98,10 +98,15 @@ class MockLogDnsTraffic {
   // A description of such a request and response can be seen here:
   // https://github.com/google/certificate-transparency-rfcs/blob/c8844de6bd0b5d3d16bac79865e6edef533d760b/dns/draft-ct-over-dns.md#hash-query-hashquery
   void ExpectLeafIndexRequestAndResponse(base::StringPiece qname,

[Eran Messeri, 2016/09/23 12:59:32]

Given the method you've added I suggest removing this one, as I can't
conceivably see why anyone would prefer to specify a numerical value as a
string.

[Rob Percival, 2016/09/27 17:44:17]

I hadn't actually meant to add this one - I was just toying with it during
testing. The version that takes the leaf index as a string is actually more
useful, as it lets you provide malformed responses.

                                          base::StringPiece leaf_index);
   // Expect a CT DNS request for the domain |qname|.
+  // Such a request will receive a DNS response containing |leaf_index| as a
+  // string.
+  void ExpectLeafIndexRequestAndResponse(base::StringPiece qname,
+                                         uint64_t leaf_index);
+  // Expect a CT DNS request for the domain |qname|.
   // Such a request will receive a DNS response containing the inclusion proof
   // nodes between |audit_path_start| and |audit_path_end|.
   // A description of such a request and response can be seen here:
   // https://github.com/google/certificate-transparency-rfcs/blob/c8844de6bd0b5d3d16bac79865e6edef533d760b/dns/draft-ct-over-dns.md#tree-query-treequery
   void ExpectAuditProofRequestAndResponse(