From d204febecfc1546b49e343eecb2b6161117a6ccf Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Mon, 7 Mar 2016 22:29:23 -0800
Subject: [PATCH] Update DevtoolsNetworkTransaction

---
 brightray/browser/net/devtools_network_transaction.cc | 8 +++++++-
 brightray/browser/net/devtools_network_transaction.h  | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/brightray/browser/net/devtools_network_transaction.cc b/brightray/browser/net/devtools_network_transaction.cc
index fa3343ef98..c65230d6f5 100644
--- a/brightray/browser/net/devtools_network_transaction.cc
+++ b/brightray/browser/net/devtools_network_transaction.cc
@@ -106,10 +106,11 @@ int DevToolsNetworkTransaction::RestartIgnoringLastError(
 
 int DevToolsNetworkTransaction::RestartWithCertificate(
     net::X509Certificate* client_certificate,
+    net::SSLPrivateKey* client_private_key,
     const net::CompletionCallback& callback) {
   if (failed_)
     return net::ERR_INTERNET_DISCONNECTED;
-  int rv = transaction_->RestartWithCertificate(client_certificate, proxy_callback_);
+  int rv = transaction_->RestartWithCertificate(client_certificate, client_private_key, proxy_callback_);
   return SetupCallback(callback, rv, RESTART_WITH_CERTIFICATE);
 }
 
@@ -185,6 +186,11 @@ bool DevToolsNetworkTransaction::GetRemoteEndpoint(
   return transaction_->GetRemoteEndpoint(endpoint);
 }
 
+void DevToolsNetworkTransaction::PopulateNetErrorDetails(
+    net::NetErrorDetails* details) const {
+  return transaction_->PopulateNetErrorDetails(details);
+}
+
 void DevToolsNetworkTransaction::SetPriority(net::RequestPriority priority) {
   transaction_->SetPriority(priority);
 }
diff --git a/brightray/browser/net/devtools_network_transaction.h b/brightray/browser/net/devtools_network_transaction.h
index 3e16db0f2c..f8e54e6777 100644
--- a/brightray/browser/net/devtools_network_transaction.h
+++ b/brightray/browser/net/devtools_network_transaction.h
@@ -46,6 +46,7 @@ class DevToolsNetworkTransaction : public net::HttpTransaction {
   int RestartIgnoringLastError(
       const net::CompletionCallback& callback) override;
   int RestartWithCertificate(net::X509Certificate* client_cert,
+                             net::SSLPrivateKey* client_private_key,
                              const net::CompletionCallback& callback) override;
   int RestartWithAuth(const net::AuthCredentials& credentials,
                       const net::CompletionCallback& callback) override;
@@ -65,6 +66,7 @@ class DevToolsNetworkTransaction : public net::HttpTransaction {
   void SetQuicServerInfo(net::QuicServerInfo* quic_server_info) override;
   bool GetLoadTimingInfo(net::LoadTimingInfo* load_timing_info) const override;
   bool GetRemoteEndpoint(net::IPEndPoint* endpoint) const override;
+  void PopulateNetErrorDetails(net::NetErrorDetails* details) const override;
   void SetPriority(net::RequestPriority priority) override;
   void SetWebSocketHandshakeStreamCreateHelper(
       net::WebSocketHandshakeStreamBase::CreateHelper* create_helper) override;