Support WebSocket in WebRequest API.

extensions/browser/api/web_request/web_request_api_helpers.h

Index: extensions/browser/api/web_request/web_request_api_helpers.h
diff --git a/extensions/browser/api/web_request/web_request_api_helpers.h b/extensions/browser/api/web_request/web_request_api_helpers.h
index 6e25fa5e73fac435e9bb4570a338fb1e1e1f343a..b1b9e6cbdb8a601bc2d303141d083f5e459370e4 100644
--- a/extensions/browser/api/web_request/web_request_api_helpers.h
+++ b/extensions/browser/api/web_request/web_request_api_helpers.h
@@ -257,7 +257,8 @@ void MergeCancelOfResponses(const EventResponseDeltas& deltas,
 // Stores in |*new_url| the redirect request of the extension with highest
 // precedence. Extensions that did not command to redirect the request are
 // ignored in this logic.
-void MergeRedirectUrlOfResponses(const EventResponseDeltas& deltas,
+void MergeRedirectUrlOfResponses(const GURL& url,
+                                 const EventResponseDeltas& deltas,
                                  GURL* new_url,
                                  extensions::WarningSet* conflicting_extensions,
                                  const net::NetLogWithSource* net_log);
@@ -265,6 +266,7 @@ void MergeRedirectUrlOfResponses(const EventResponseDeltas& deltas,
 // precedence. Extensions that did not command to redirect the request are
 // ignored in this logic.
 void MergeOnBeforeRequestResponses(
+    const GURL& url,
     const EventResponseDeltas& deltas,
     GURL* new_url,
     extensions::WarningSet* conflicting_extensions,
@@ -301,6 +303,7 @@ void MergeCookiesInOnHeadersReceivedResponses(
 // (to request redirection) and |*allowed_unsafe_redirect_url| (to make sure
 // that the request is not cancelled with net::ERR_UNSAFE_REDIRECT).
 void MergeOnHeadersReceivedResponses(
+    const GURL& url,
     const EventResponseDeltas& deltas,
     const net::HttpResponseHeaders* original_response_headers,
     scoped_refptr<net::HttpResponseHeaders>* override_response_headers,