Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Side by Side Diff: extensions/browser/api/web_request/web_request_api_helpers.cc

Issue 1594973004: Remove use of void** from HttpResponseHeaders::EnumerateHeaderLines (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/api/web_request/web_request_api_helpers.h" 5 #include "extensions/browser/api/web_request/web_request_api_helpers.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 EventResponseDelta* result = 371 EventResponseDelta* result =
372 new EventResponseDelta(extension_id, extension_install_time); 372 new EventResponseDelta(extension_id, extension_install_time);
373 result->cancel = cancel; 373 result->cancel = cancel;
374 result->new_url = new_url; 374 result->new_url = new_url;
375 375
376 if (!new_response_headers) 376 if (!new_response_headers)
377 return result; 377 return result;
378 378
379 // Find deleted headers (header keys are treated case insensitively). 379 // Find deleted headers (header keys are treated case insensitively).
380 { 380 {
381 void* iter = NULL; 381 size_t iter = 0;
382 std::string name; 382 std::string name;
383 std::string value; 383 std::string value;
384 while (old_response_headers->EnumerateHeaderLines(&iter, &name, &value)) { 384 while (old_response_headers->EnumerateHeaderLines(&iter, &name, &value)) {
385 std::string name_lowercase = base::ToLowerASCII(name); 385 std::string name_lowercase = base::ToLowerASCII(name);
386 386
387 bool header_found = false; 387 bool header_found = false;
388 for (const auto& i : *new_response_headers) { 388 for (const auto& i : *new_response_headers) {
389 if (base::LowerCaseEqualsASCII(i.first, name_lowercase) && 389 if (base::LowerCaseEqualsASCII(i.first, name_lowercase) &&
390 value == i.second) { 390 value == i.second) {
391 header_found = true; 391 header_found = true;
392 break; 392 break;
393 } 393 }
394 } 394 }
395 if (!header_found) 395 if (!header_found)
396 result->deleted_response_headers.push_back(ResponseHeader(name, value)); 396 result->deleted_response_headers.push_back(ResponseHeader(name, value));
397 } 397 }
398 } 398 }
399 399
400 // Find added headers (header keys are treated case insensitively). 400 // Find added headers (header keys are treated case insensitively).
401 { 401 {
402 for (const auto& i : *new_response_headers) { 402 for (const auto& i : *new_response_headers) {
403 std::string name_lowercase = base::ToLowerASCII(i.first); 403 std::string name_lowercase = base::ToLowerASCII(i.first);
404 void* iter = nullptr; 404 size_t iter = 0;
405 std::string name; 405 std::string name;
406 std::string value; 406 std::string value;
407 bool header_found = false; 407 bool header_found = false;
408 while (old_response_headers->EnumerateHeaderLines(&iter, &name, &value)) { 408 while (old_response_headers->EnumerateHeaderLines(&iter, &name, &value)) {
409 if (base::LowerCaseEqualsASCII(name, name_lowercase) && 409 if (base::LowerCaseEqualsASCII(name, name_lowercase) &&
410 value == i.second) { 410 value == i.second) {
411 header_found = true; 411 header_found = true;
412 break; 412 break;
413 } 413 }
414 } 414 }
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
1313 std::find(kResourceTypeStrings, 1313 std::find(kResourceTypeStrings,
1314 kResourceTypeStrings + kResourceTypeStringsLength, 1314 kResourceTypeStrings + kResourceTypeStringsLength,
1315 type_str); 1315 type_str);
1316 if (iter == (kResourceTypeStrings + kResourceTypeStringsLength)) 1316 if (iter == (kResourceTypeStrings + kResourceTypeStringsLength))
1317 return false; 1317 return false;
1318 *type = kResourceTypeValues[iter - kResourceTypeStrings]; 1318 *type = kResourceTypeValues[iter - kResourceTypeStrings];
1319 return true; 1319 return true;
1320 } 1320 }
1321 1321
1322 } // namespace extension_web_request_api_helpers 1322 } // namespace extension_web_request_api_helpers
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698