Index: extensions/browser/api/web_request/web_request_api_helpers.cc |
diff --git a/extensions/browser/api/web_request/web_request_api_helpers.cc b/extensions/browser/api/web_request/web_request_api_helpers.cc |
index 29de9b6953e037cddb4932061fa54f1ae5b65a0b..0abf1657cc979fe7a1637f6ae52727fb12cefce6 100644 |
--- a/extensions/browser/api/web_request/web_request_api_helpers.cc |
+++ b/extensions/browser/api/web_request/web_request_api_helpers.cc |
@@ -302,7 +302,7 @@ EventResponseDelta* CalculateOnHeadersReceivedDelta( |
// Find deleted headers (header keys are treated case insensitively). |
{ |
- void* iter = NULL; |
+ void* iter = nullptr; |
std::string name; |
std::string value; |
while (old_response_headers->EnumerateHeaderLines(&iter, &name, &value)) { |
@@ -327,7 +327,7 @@ EventResponseDelta* CalculateOnHeadersReceivedDelta( |
{ |
for (ResponseHeaders::const_iterator i = new_response_headers->begin(); |
i != new_response_headers->end(); ++i) { |
- void* iter = NULL; |
+ void* iter = nullptr; |
std::string value; |
bool header_found = false; |
while (old_response_headers->EnumerateHeader(&iter, i->first, &value) && |
@@ -759,7 +759,7 @@ static ParsedResponseCookies GetResponseCookies( |
scoped_refptr<net::HttpResponseHeaders> override_response_headers) { |
ParsedResponseCookies result; |
- void* iter = NULL; |
+ void* iter = nullptr; |
std::string value; |
while (override_response_headers->EnumerateHeader(&iter, "Set-Cookie", |
&value)) { |
@@ -961,7 +961,7 @@ void MergeCookiesInOnHeadersReceivedResponses( |
return; |
// Only create a copy if we really want to modify the response headers. |
- if (override_response_headers->get() == NULL) { |
+ if (override_response_headers->get() == nullptr) { |
*override_response_headers = new net::HttpResponseHeaders( |
original_response_headers->raw_headers()); |
} |
@@ -1028,7 +1028,7 @@ void MergeOnHeadersReceivedResponses( |
} |
// Only create a copy if we really want to modify the response headers. |
- if (override_response_headers->get() == NULL) { |
+ if (override_response_headers->get() == nullptr) { |
*override_response_headers = new net::HttpResponseHeaders( |
original_response_headers->raw_headers()); |
} |
@@ -1096,7 +1096,7 @@ void MergeOnHeadersReceivedResponses( |
deltas, &new_url, conflicting_extensions, net_log); |
if (new_url.is_valid()) { |
// Only create a copy if we really want to modify the response headers. |
- if (override_response_headers->get() == NULL) { |
+ if (override_response_headers->get() == nullptr) { |
*override_response_headers = new net::HttpResponseHeaders( |
original_response_headers->raw_headers()); |
} |