Merge LogDnsClient's QueryLeafIndex and QueryAuditProof methods

components/certificate_transparency/mock_log_dns_traffic.cc

 // 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.
 
 #include "components/certificate_transparency/mock_log_dns_traffic.h"
 
 #include <algorithm>
 #include <numeric>
 #include <vector>
 
 #include "base/big_endian.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/sys_byteorder.h"
 #include "base/test/test_timeouts.h"
 #include "net/dns/dns_client.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/dns_util.h"
 #include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace certificate_transparency {
 
@@ skipping 175 matching lines @@
     base::StringPiece qname,
     base::StringPiece leaf_index) {
   // Prepend size to leaf_index to create the query answer (rdata)
   ASSERT_LE(leaf_index.size(), 0xFFul);  // size must fit into a single byte
   std::string answer = leaf_index.as_string();
   answer.insert(answer.begin(), static_cast<char>(leaf_index.size()));
 
   ExpectRequestAndResponse(qname, answer);
 }
 
+void MockLogDnsTraffic::ExpectLeafIndexRequestAndResponse(
+    base::StringPiece qname,
+    uint64_t leaf_index) {
+  ExpectLeafIndexRequestAndResponse(qname, base::Uint64ToString(leaf_index));
+}
+
 void MockLogDnsTraffic::ExpectAuditProofRequestAndResponse(
     base::StringPiece qname,
     std::vector<std::string>::const_iterator audit_path_start,
     std::vector<std::string>::const_iterator audit_path_end) {
   // Join nodes in the audit path into a single string.
   std::string proof =
       std::accumulate(audit_path_start, audit_path_end, std::string());
 
   // Prepend size to proof to create the query answer (rdata)
   ASSERT_LE(proof.size(), 0xFFul);  // size must fit into a single byte
@@ skipping 44 matching lines @@
 }
 
 void MockLogDnsTraffic::SetDnsTimeout(const base::TimeDelta& timeout) {
   net::DnsConfig dns_config;
   DnsChangeNotifier::GetDnsConfig(&dns_config);
   dns_config.timeout = timeout;
   DnsChangeNotifier::SetDnsConfig(dns_config);
 }
 
 }  // namespace certificate_transparency