MockLogDnsTraffic now returns bool instead of CHECKing bad arguments

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>
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "net/dns/dns_client.h"
 #include "net/dns/dns_config_service.h"
 #include "net/socket/socket_test_util.h"
 
 namespace certificate_transparency {
 
 // Mocks DNS requests and responses for a Certificate Transparency (CT) log.
 // This is implemented using mock sockets. Call the CreateDnsClient() method to
@@ skipping 19 matching lines @@
 // log_client.QueryAuditProof("ct.test", ..., base::Bind(...));
 class MockLogDnsTraffic {
  public:
   MockLogDnsTraffic();
   ~MockLogDnsTraffic();
 
   // Expect a CT DNS request for the domain |qname|.
   // Such a request will receive a DNS response indicating that the error
   // specified by |rcode| occurred. See RFC1035, Section 4.1.1 for |rcode|
   // values.
-  void ExpectRequestAndErrorResponse(base::StringPiece qname, uint8_t rcode);
+  // Returns false if any of the arguments are invalid.
+  WARN_UNUSED_RESULT
+  bool ExpectRequestAndErrorResponse(base::StringPiece qname, uint8_t rcode);
 
   // Expect a CT DNS request for the domain |qname|.
   // Such a request will trigger a socket error of type |error|.
-  void ExpectRequestAndSocketError(base::StringPiece qname, net::Error error);
+  // Returns false if any of the arguments are invalid.
+  WARN_UNUSED_RESULT
+  bool ExpectRequestAndSocketError(base::StringPiece qname, net::Error 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);
+  // Returns false if |qname| is invalid.
+  WARN_UNUSED_RESULT
+  bool ExpectRequestAndTimeout(base::StringPiece qname);
 
   // Expect a CT DNS request for the domain |qname|.
   // Such a request will receive a DNS TXT response containing |txt_strings|.
-  void ExpectRequestAndResponse(
-    base::StringPiece qname,
-    const std::vector<base::StringPiece>& txt_strings);
+  // Returns false if any of the arguments are invalid.
+  WARN_UNUSED_RESULT
+  bool ExpectRequestAndResponse(
+      base::StringPiece qname,
+      const std::vector<base::StringPiece>& txt_strings);
+
   // 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,
+  // Returns false if any of the arguments are invalid.
+  WARN_UNUSED_RESULT
+  bool 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(
+  // Returns false if any of the arguments are invalid.
+  WARN_UNUSED_RESULT
+  bool 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.
   // Requires that net::NetworkChangeNotifier is initialized first.
   // The DNS config is propogated to NetworkChangeNotifier::DNSObservers
   // asynchronously.
   void InitializeDnsConfig();
 
@@ skipping 37 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_