1 files changed, 5 insertions, 8 deletions
diff --git a/chromium/components/certificate_transparency/mock_log_dns_traffic.cc b/chromium/components/certificate_transparency/mock_log_dns_traffic.cc
index 46db34378ca..69d9578fab3 100644
--- a/chromium/components/certificate_transparency/mock_log_dns_traffic.cc
+++ b/chromium/components/certificate_transparency/mock_log_dns_traffic.cc
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/big_endian.h"
+#include "base/containers/span.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_byteorder.h"
@@ -32,10 +33,6 @@ const net::MockRead kNoMoreData(net::SYNCHRONOUS, net::ERR_UNEXPECTED, 2);
 // Necessary to expose SetDnsConfig for testing.
 class DnsChangeNotifier : public net::NetworkChangeNotifier {
  public:
-  static void SetInitialDnsConfig(const net::DnsConfig& config) {
-    net::NetworkChangeNotifier::SetInitialDnsConfig(config);
-  }
-
   static void SetDnsConfig(const net::DnsConfig& config) {
     net::NetworkChangeNotifier::SetDnsConfig(config);
   }
@@ -158,7 +155,7 @@ class MockLogDnsTraffic::MockSocketData {
                                       expected_read_payload_.size(),
                                       1),
                         kNoMoreData},
-        socket_data_(expected_reads_, 2, &expected_write_, 1) {}
+        socket_data_(expected_reads_, base::make_span(&expected_write_, 1)) {}
 
   // A socket that expects one write and a read error.
   MockSocketData(const std::vector<char>& write, net::Error error)
@@ -168,7 +165,7 @@ class MockLogDnsTraffic::MockSocketData {
                         expected_write_payload_.size(),
                         0),
         expected_reads_{net::MockRead(net::ASYNC, error, 1), kNoMoreData},
-        socket_data_(expected_reads_, 2, &expected_write_, 1) {}
+        socket_data_(expected_reads_, base::make_span(&expected_write_, 1)) {}
 
   // A socket that expects one write and no response.
   explicit MockSocketData(const std::vector<char>& write)
@@ -179,7 +176,7 @@ class MockLogDnsTraffic::MockSocketData {
                         0),
         expected_reads_{net::MockRead(net::SYNCHRONOUS, net::ERR_IO_PENDING, 1),
                         kNoMoreData},
-        socket_data_(expected_reads_, 2, &expected_write_, 1) {}
+        socket_data_(expected_reads_, base::make_span(&expected_write_, 1)) {}
 
   ~MockSocketData() {}
 
@@ -311,7 +308,7 @@ void MockLogDnsTraffic::InitializeDnsConfig() {
   // IDs.
   dns_config.randomize_ports = false;
 
-  DnsChangeNotifier::SetInitialDnsConfig(dns_config);
+  DnsChangeNotifier::SetDnsConfig(dns_config);
 }
 
 void MockLogDnsTraffic::SetDnsConfig(const net::DnsConfig& config) {