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

Side by Side 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: 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 10
(...skipping 2072 matching lines...) Expand 10 before | Expand all | Expand 10 after
2083 MergeOnHeadersReceivedResponses(deltas, 2083 MergeOnHeadersReceivedResponses(deltas,
2084 base_headers.get(), 2084 base_headers.get(),
2085 &new_headers1, 2085 &new_headers1,
2086 &allowed_unsafe_redirect_url1, 2086 &allowed_unsafe_redirect_url1,
2087 &warning_set, 2087 &warning_set,
2088 &net_log); 2088 &net_log);
2089 ASSERT_TRUE(new_headers1.get()); 2089 ASSERT_TRUE(new_headers1.get());
2090 EXPECT_TRUE(allowed_unsafe_redirect_url1.is_empty()); 2090 EXPECT_TRUE(allowed_unsafe_redirect_url1.is_empty());
2091 std::multimap<std::string, std::string> expected1; 2091 std::multimap<std::string, std::string> expected1;
2092 expected1.insert(std::pair<std::string, std::string>("Key2", "Value3")); 2092 expected1.insert(std::pair<std::string, std::string>("Key2", "Value3"));
2093 void* iter = NULL; 2093 size_t iter = 0;
2094 std::string name; 2094 std::string name;
2095 std::string value; 2095 std::string value;
2096 std::multimap<std::string, std::string> actual1; 2096 std::multimap<std::string, std::string> actual1;
2097 while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) { 2097 while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) {
2098 actual1.insert(std::pair<std::string, std::string>(name, value)); 2098 actual1.insert(std::pair<std::string, std::string>(name, value));
2099 } 2099 }
2100 EXPECT_EQ(expected1, actual1); 2100 EXPECT_EQ(expected1, actual1);
2101 EXPECT_EQ(0u, warning_set.size()); 2101 EXPECT_EQ(0u, warning_set.size());
2102 EXPECT_EQ(1u, capturing_net_log.GetSize()); 2102 EXPECT_EQ(1u, capturing_net_log.GetSize());
2103 2103
(...skipping 11 matching lines...) Expand all
2115 scoped_refptr<net::HttpResponseHeaders> new_headers2; 2115 scoped_refptr<net::HttpResponseHeaders> new_headers2;
2116 GURL allowed_unsafe_redirect_url2; 2116 GURL allowed_unsafe_redirect_url2;
2117 MergeOnHeadersReceivedResponses(deltas, 2117 MergeOnHeadersReceivedResponses(deltas,
2118 base_headers.get(), 2118 base_headers.get(),
2119 &new_headers2, 2119 &new_headers2,
2120 &allowed_unsafe_redirect_url2, 2120 &allowed_unsafe_redirect_url2,
2121 &warning_set, 2121 &warning_set,
2122 &net_log); 2122 &net_log);
2123 ASSERT_TRUE(new_headers2.get()); 2123 ASSERT_TRUE(new_headers2.get());
2124 EXPECT_TRUE(allowed_unsafe_redirect_url2.is_empty()); 2124 EXPECT_TRUE(allowed_unsafe_redirect_url2.is_empty());
2125 iter = NULL; 2125 iter = 0;
2126 std::multimap<std::string, std::string> actual2; 2126 std::multimap<std::string, std::string> actual2;
2127 while (new_headers2->EnumerateHeaderLines(&iter, &name, &value)) { 2127 while (new_headers2->EnumerateHeaderLines(&iter, &name, &value)) {
2128 actual2.insert(std::pair<std::string, std::string>(name, value)); 2128 actual2.insert(std::pair<std::string, std::string>(name, value));
2129 } 2129 }
2130 EXPECT_EQ(expected1, actual2); 2130 EXPECT_EQ(expected1, actual2);
2131 EXPECT_EQ(1u, warning_set.size()); 2131 EXPECT_EQ(1u, warning_set.size());
2132 EXPECT_TRUE(HasWarning(warning_set, "extid2")); 2132 EXPECT_TRUE(HasWarning(warning_set, "extid2"));
2133 EXPECT_EQ(2u, capturing_net_log.GetSize()); 2133 EXPECT_EQ(2u, capturing_net_log.GetSize());
2134 } 2134 }
2135 2135
(...skipping 29 matching lines...) Expand all
2165 &new_headers1, 2165 &new_headers1,
2166 &allowed_unsafe_redirect_url1, 2166 &allowed_unsafe_redirect_url1,
2167 &warning_set, 2167 &warning_set,
2168 &net_log); 2168 &net_log);
2169 ASSERT_TRUE(new_headers1.get()); 2169 ASSERT_TRUE(new_headers1.get());
2170 EXPECT_TRUE(allowed_unsafe_redirect_url1.is_empty()); 2170 EXPECT_TRUE(allowed_unsafe_redirect_url1.is_empty());
2171 std::multimap<std::string, std::string> expected1; 2171 std::multimap<std::string, std::string> expected1;
2172 expected1.insert(std::pair<std::string, std::string>("Key1", "Value1")); 2172 expected1.insert(std::pair<std::string, std::string>("Key1", "Value1"));
2173 expected1.insert(std::pair<std::string, std::string>("Key1", "Value3")); 2173 expected1.insert(std::pair<std::string, std::string>("Key1", "Value3"));
2174 expected1.insert(std::pair<std::string, std::string>("Key2", "Value4")); 2174 expected1.insert(std::pair<std::string, std::string>("Key2", "Value4"));
2175 void* iter = NULL; 2175 size_t iter = 0;
2176 std::string name; 2176 std::string name;
2177 std::string value; 2177 std::string value;
2178 std::multimap<std::string, std::string> actual1; 2178 std::multimap<std::string, std::string> actual1;
2179 while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) { 2179 while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) {
2180 actual1.insert(std::pair<std::string, std::string>(name, value)); 2180 actual1.insert(std::pair<std::string, std::string>(name, value));
2181 } 2181 }
2182 EXPECT_EQ(expected1, actual1); 2182 EXPECT_EQ(expected1, actual1);
2183 EXPECT_EQ(0u, warning_set.size()); 2183 EXPECT_EQ(0u, warning_set.size());
2184 EXPECT_EQ(1u, capturing_net_log.GetSize()); 2184 EXPECT_EQ(1u, capturing_net_log.GetSize());
2185 } 2185 }
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
2315 EXPECT_TRUE(credentials_set); 2315 EXPECT_TRUE(credentials_set);
2316 EXPECT_FALSE(auth3.Empty()); 2316 EXPECT_FALSE(auth3.Empty());
2317 EXPECT_EQ(username, auth1.username()); 2317 EXPECT_EQ(username, auth1.username());
2318 EXPECT_EQ(password, auth1.password()); 2318 EXPECT_EQ(password, auth1.password());
2319 EXPECT_EQ(1u, warning_set.size()); 2319 EXPECT_EQ(1u, warning_set.size());
2320 EXPECT_TRUE(HasWarning(warning_set, "extid2")); 2320 EXPECT_TRUE(HasWarning(warning_set, "extid2"));
2321 EXPECT_EQ(3u, capturing_net_log.GetSize()); 2321 EXPECT_EQ(3u, capturing_net_log.GetSize());
2322 } 2322 }
2323 2323
2324 } // namespace extensions 2324 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698