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

Unified Diff: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

Issue 1594973004: Remove use of void** from HttpResponseHeaders::EnumerateHeaderLines (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index 3b672fe27e44a271e43eba1e0be2519b95d61505..c695566915e1a9f4dcc39582f7d2a82b94a4ee45 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -2090,11 +2090,11 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) {
EXPECT_TRUE(allowed_unsafe_redirect_url1.is_empty());
std::multimap<std::string, std::string> expected1;
expected1.insert(std::pair<std::string, std::string>("Key2", "Value3"));
- void* iter = NULL;
+ size_t iter = 0;
std::string name;
std::string value;
std::multimap<std::string, std::string> actual1;
- while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) {
+ while (new_headers1->EnumerateHeaderLines(iter, &name, &value)) {
actual1.insert(std::pair<std::string, std::string>(name, value));
}
EXPECT_EQ(expected1, actual1);
@@ -2122,9 +2122,9 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) {
&net_log);
ASSERT_TRUE(new_headers2.get());
EXPECT_TRUE(allowed_unsafe_redirect_url2.is_empty());
- iter = NULL;
+ iter = 0;
std::multimap<std::string, std::string> actual2;
- while (new_headers2->EnumerateHeaderLines(&iter, &name, &value)) {
+ while (new_headers2->EnumerateHeaderLines(iter, &name, &value)) {
actual2.insert(std::pair<std::string, std::string>(name, value));
}
EXPECT_EQ(expected1, actual2);
@@ -2172,11 +2172,11 @@ TEST(ExtensionWebRequestHelpersTest,
expected1.insert(std::pair<std::string, std::string>("Key1", "Value1"));
expected1.insert(std::pair<std::string, std::string>("Key1", "Value3"));
expected1.insert(std::pair<std::string, std::string>("Key2", "Value4"));
- void* iter = NULL;
+ size_t iter = 0;
std::string name;
std::string value;
std::multimap<std::string, std::string> actual1;
- while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) {
+ while (new_headers1->EnumerateHeaderLines(iter, &name, &value)) {
actual1.insert(std::pair<std::string, std::string>(name, value));
}
EXPECT_EQ(expected1, actual1);

Powered by Google App Engine
This is Rietveld 408576698