From afc889b88369dceca0d50285ba48d87f23481391 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Thu, 26 Jun 2014 16:33:11 -0400
Subject: [PATCH] Update NetworkDelegate for Chrome 35

---
 brightray/browser/network_delegate.cc | 8 ++------
 brightray/browser/network_delegate.h  | 6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/brightray/browser/network_delegate.cc b/brightray/browser/network_delegate.cc
index a915752b38..ec019a5f28 100644
--- a/brightray/browser/network_delegate.cc
+++ b/brightray/browser/network_delegate.cc
@@ -37,7 +37,8 @@ int NetworkDelegate::OnHeadersReceived(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     const net::HttpResponseHeaders* original_response_headers,
-    scoped_refptr<net::HttpResponseHeaders>* override_response_headers) {
+    scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
+    GURL* allowed_unsafe_redirect_url) {
   return net::OK;
 }
 
@@ -97,9 +98,4 @@ int NetworkDelegate::OnBeforeSocketStreamConnect(
   return net::OK;
 }
 
-void NetworkDelegate::OnRequestWaitStateChange(
-    const net::URLRequest& request,
-    RequestWaitState waiting) {
-}
-
 }  // namespace brightray
diff --git a/brightray/browser/network_delegate.h b/brightray/browser/network_delegate.h
index 3e258ac14f..94be71d985 100644
--- a/brightray/browser/network_delegate.h
+++ b/brightray/browser/network_delegate.h
@@ -27,8 +27,8 @@ class NetworkDelegate : public net::NetworkDelegate {
       net::URLRequest* request,
       const net::CompletionCallback& callback,
       const net::HttpResponseHeaders* original_response_headers,
-      scoped_refptr<net::HttpResponseHeaders>*
-          override_response_headers) OVERRIDE;
+      scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
+      GURL* allowed_unsafe_redirect_url) OVERRIDE;
   virtual void OnBeforeRedirect(net::URLRequest* request,
                                 const GURL& new_location) OVERRIDE;
   virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
@@ -55,8 +55,6 @@ class NetworkDelegate : public net::NetworkDelegate {
   virtual int OnBeforeSocketStreamConnect(
       net::SocketStream* stream,
       const net::CompletionCallback& callback) OVERRIDE;
-  virtual void OnRequestWaitStateChange(const net::URLRequest& request,
-                                        RequestWaitState state) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkDelegate);