Merge LogDnsClient's QueryLeafIndex and QueryAuditProof methods

components/certificate_transparency/mock_log_dns_traffic.h

 // Copyright 2016 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.
 
 #ifndef COMPONENTS_CERTIFICATE_TRANSPARENCY_MOCK_LOG_DNS_TRAFFIC_H_
 #define COMPONENTS_CERTIFICATE_TRANSPARENCY_MOCK_LOG_DNS_TRAFFIC_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 79 matching lines @@
   // |net_error| can be any net:Error value.
   void ExpectRequestAndSocketError(base::StringPiece qname, int net_error);
   // Expect a CT DNS request for the domain |qname|.
   // Such a request will timeout.
   // This will reduce the DNS timeout to minimize test duration.
   void ExpectRequestAndTimeout(base::StringPiece qname);
   // Expect a CT DNS request for the domain |qname|.
   // Such a request will receive a DNS response containing |leaf_index|.
   // 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(
       base::StringPiece qname,
       std::vector<std::string>::const_iterator audit_path_start,
       std::vector<std::string>::const_iterator audit_path_end);
 
   // Sets the initial DNS config appropriate for testing.
@@ skipping 40 matching lines @@
   net::MockClientSocketFactory socket_factory_;
   // Controls whether mock socket reads are asynchronous.
   net::IoMode socket_read_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(MockLogDnsTraffic);
 };
 
 }  // namespace certificate_transparency
 
 #endif  // COMPONENTS_CERTIFICATE_TRANSPARENCY_MOCK_LOG_DNS_TRAFFIC_H_