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 fae87e724ae8931d27dbd89c23cae47e6b006112..18d47cba0df280bb1e5a9f1bc05b4cdfa14e2378 100644 |
--- a/extensions/browser/api/web_request/web_request_api_helpers.h |
+++ b/extensions/browser/api/web_request/web_request_api_helpers.h |
@@ -273,41 +273,61 @@ void MergeOnBeforeRequestResponses( |
// Modifies the "Cookie" header in |request_headers| according to |
// |deltas.request_cookie_modifications|. Conflicts are currently ignored |
// silently. |
+// Stores in |request_cookies_modified| whether the request cookies were |
+// modified. |
void MergeCookiesInOnBeforeSendHeadersResponses( |
const EventResponseDeltas& deltas, |
net::HttpRequestHeaders* request_headers, |
extensions::WarningSet* conflicting_extensions, |
- const net::NetLogWithSource* net_log); |
+ const net::NetLogWithSource* net_log, |
+ bool* request_cookies_modified); |
+ |
// Modifies the headers in |request_headers| according to |deltas|. Conflicts |
// are tried to be resolved. |
+// Stores in |request_headers_modified| whether the request headers (excluding |
+// the cookie header) were modified. |
+// Stores in |request_cookies_modified| whether the request cookies were |
+// modified. |
void MergeOnBeforeSendHeadersResponses( |
const EventResponseDeltas& deltas, |
net::HttpRequestHeaders* request_headers, |
extensions::WarningSet* conflicting_extensions, |
- const net::NetLogWithSource* net_log); |
+ const net::NetLogWithSource* net_log, |
+ bool* request_headers_modified, |
+ bool* request_cookies_modified); |
+ |
// Modifies the "Set-Cookie" headers in |override_response_headers| according to |
// |deltas.response_cookie_modifications|. If |override_response_headers| is |
// NULL, a copy of |original_response_headers| is created. Conflicts are |
// currently ignored silently. |
+// Stores in |response_cookies_modified| whether the response cookies were |
+// modified. |
void MergeCookiesInOnHeadersReceivedResponses( |
const EventResponseDeltas& deltas, |
const net::HttpResponseHeaders* original_response_headers, |
scoped_refptr<net::HttpResponseHeaders>* override_response_headers, |
extensions::WarningSet* conflicting_extensions, |
- const net::NetLogWithSource* net_log); |
+ const net::NetLogWithSource* net_log, |
+ bool* response_cookies_modified); |
// 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. |
// Extension-initiated redirects are written to |override_response_headers| |
// (to request redirection) and |*allowed_unsafe_redirect_url| (to make sure |
// that the request is not cancelled with net::ERR_UNSAFE_REDIRECT). |
+// Stores in |response_headers_modified| whether the response headers (excluding |
+// the cookie header) were modified. |
+// Stores in |response_cookies_modified| whether the response cookies were |
+// modified. |
void MergeOnHeadersReceivedResponses( |
const EventResponseDeltas& deltas, |
const net::HttpResponseHeaders* original_response_headers, |
scoped_refptr<net::HttpResponseHeaders>* override_response_headers, |
GURL* allowed_unsafe_redirect_url, |
extensions::WarningSet* conflicting_extensions, |
- const net::NetLogWithSource* net_log); |
+ const net::NetLogWithSource* net_log, |
+ bool* response_headers_modified, |
+ bool* response_cookies_modified); |
// Merge the responses of blocked onAuthRequired handlers. The first |
// registered listener that supplies authentication credentials in a response, |
// if any, will have its authentication credentials used. |request| must be |