Index: chrome/browser/extensions/api/web_request/web_request_api_helpers.h |
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.h b/chrome/browser/extensions/api/web_request/web_request_api_helpers.h |
index 90b2f84bf1004210d28cd1953bc14c6a8ad0efe6..c23f8c81c84a378f742808ea7e691a9c0c96c87c 100644 |
--- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.h |
+++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.h |
@@ -214,6 +214,7 @@ EventResponseDelta* CalculateOnHeadersReceivedDelta( |
const std::string& extension_id, |
const base::Time& extension_install_time, |
bool cancel, |
+ const GURL& new_url, |
const net::HttpResponseHeaders* old_response_headers, |
ResponseHeaders* new_response_headers); |
// Destructively moves the auth credentials from |auth_credentials| to the |
@@ -238,6 +239,14 @@ void MergeCancelOfResponses( |
// 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, |
+ GURL* new_url, |
+ extensions::ExtensionWarningSet* conflicting_extensions, |
+ const net::BoundNetLog* net_log); |
+// 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 MergeOnBeforeRequestResponses( |
const EventResponseDeltas& deltas, |
GURL* new_url, |
@@ -268,11 +277,14 @@ void MergeCookiesInOnHeadersReceivedResponses( |
scoped_refptr<net::HttpResponseHeaders>* override_response_headers, |
extensions::ExtensionWarningSet* conflicting_extensions, |
const net::BoundNetLog* net_log); |
+// Stores in |*new_url| the redirect request of the extension with highest |
+// precedence. |
// Stores a copy of |original_response_header| into |override_response_headers| |
// that is modified according to |deltas|. If |deltas| does not instruct to |
// modify the response headers, |override_response_headers| remains empty. |
void MergeOnHeadersReceivedResponses( |
const EventResponseDeltas& deltas, |
+ GURL* new_url, |
const net::HttpResponseHeaders* original_response_headers, |
scoped_refptr<net::HttpResponseHeaders>* override_response_headers, |
extensions::ExtensionWarningSet* conflicting_extensions, |