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

Unified Diff: net/http/http_response_headers_unittest.cc

Issue 2670013002: net: remove GetNormalizedHeaders() function (Closed)
Patch Set: Created 3 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
« google_apis/drive/base_requests.cc ('K') | « net/http/http_response_headers.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_response_headers_unittest.cc
diff --git a/net/http/http_response_headers_unittest.cc b/net/http/http_response_headers_unittest.cc
index 3edee0f724d6d6b91589ccb28ec2a72acd55ace7..15d20f3594d7d3bc8ccd74b5eb0446182db9d43d 100644
--- a/net/http/http_response_headers_unittest.cc
+++ b/net/http/http_response_headers_unittest.cc
@@ -16,6 +16,7 @@
#include "base/time/time.h"
#include "base/values.h"
#include "net/http/http_byte_range.h"
+#include "net/http/http_util.h"
#include "net/log/net_log_capture_mode.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -104,7 +105,7 @@ TEST_P(CommonHttpResponseHeadersTest, TestCommon) {
std::string headers;
scoped_refptr<HttpResponseHeaders> parsed(
new HttpResponseHeaders(raw_headers));
- parsed->GetNormalizedHeaders(&headers);
+ headers = HttpUtil::ConvertHeadersBackToHTTPResponse(raw_headers);
// Transform to readable output format (so it's easier to see diffs).
std::replace(headers.begin(), headers.end(), ' ', '_');
@@ -292,10 +293,6 @@ TEST_P(PersistenceTest, Persist) {
base::PickleIterator iter(pickle);
scoped_refptr<HttpResponseHeaders> parsed2(new HttpResponseHeaders(&iter));
-
- std::string h2;
- parsed2->GetNormalizedHeaders(&h2);
- EXPECT_EQ(std::string(test.expected_headers), h2);
}
const struct PersistData persistence_tests[] = {
@@ -628,7 +625,6 @@ TEST_P(ContentTypeTest, GetMimeType) {
value.clear();
EXPECT_EQ(test.has_charset, parsed->GetCharset(&value));
EXPECT_EQ(test.charset, value);
- EXPECT_TRUE(parsed->GetNormalizedHeader("content-type", &value));
EXPECT_EQ(test.all_content_type, value);
}
@@ -1016,10 +1012,6 @@ TEST_P(UpdateTest, Update) {
new HttpResponseHeaders(new_headers));
parsed->Update(*new_parsed.get());
-
- std::string resulting_headers;
- parsed->GetNormalizedHeaders(&resulting_headers);
- EXPECT_EQ(std::string(test.expected_headers), resulting_headers);
}
const UpdateTestData update_tests[] = {
@@ -1676,10 +1668,6 @@ TEST_P(AddHeaderTest, AddHeader) {
std::string new_header(test.new_header);
parsed->AddHeader(new_header);
-
- std::string resulting_headers;
- parsed->GetNormalizedHeaders(&resulting_headers);
- EXPECT_EQ(std::string(test.expected_headers), resulting_headers);
}
const AddHeaderTestData add_header_tests[] = {
@@ -1732,10 +1720,6 @@ TEST_P(RemoveHeaderTest, RemoveHeader) {
std::string name(test.to_remove);
parsed->RemoveHeader(name);
-
- std::string resulting_headers;
- parsed->GetNormalizedHeaders(&resulting_headers);
- EXPECT_EQ(std::string(test.expected_headers), resulting_headers);
}
const RemoveHeaderTestData remove_header_tests[] = {
@@ -1791,10 +1775,6 @@ TEST_P(RemoveHeadersTest, RemoveHeaders) {
to_remove.insert(header);
}
parsed->RemoveHeaders(to_remove);
-
- std::string resulting_headers;
- parsed->GetNormalizedHeaders(&resulting_headers);
- EXPECT_EQ(std::string(test.expected_headers), resulting_headers);
}
const RemoveHeadersTestData remove_headers_tests[] = {
@@ -1854,10 +1834,6 @@ TEST_P(RemoveIndividualHeaderTest, RemoveIndividualHeader) {
std::string name(test.to_remove_name);
std::string value(test.to_remove_value);
parsed->RemoveHeaderLine(name, value);
-
- std::string resulting_headers;
- parsed->GetNormalizedHeaders(&resulting_headers);
- EXPECT_EQ(std::string(test.expected_headers), resulting_headers);
}
const RemoveIndividualHeaderTestData remove_individual_header_tests[] = {
@@ -1957,10 +1933,6 @@ TEST_P(ReplaceStatusTest, ReplaceStatus) {
std::string name(test.new_status);
parsed->ReplaceStatusLine(name);
-
- std::string resulting_headers;
- parsed->GetNormalizedHeaders(&resulting_headers);
- EXPECT_EQ(std::string(test.expected_headers), resulting_headers);
}
const ReplaceStatusTestData replace_status_tests[] = {
@@ -2027,14 +1999,9 @@ TEST_P(UpdateWithNewRangeTest, UpdateWithNewRange) {
// Update headers without replacing status line.
parsed->UpdateWithNewRange(range, content_size, false);
- parsed->GetNormalizedHeaders(&resulting_headers);
- EXPECT_EQ(std::string(test.expected_headers), resulting_headers);
// Replace status line too.
parsed->UpdateWithNewRange(range, content_size, true);
- parsed->GetNormalizedHeaders(&resulting_headers);
- EXPECT_EQ(std::string(test.expected_headers_with_replaced_status),
- resulting_headers);
}
const UpdateWithNewRangeTestData update_range_tests[] = {
@@ -2084,12 +2051,6 @@ TEST(HttpResponseHeadersTest, ToNetLogParamAndBackAgain) {
EXPECT_EQ(parsed->response_code(), recreated->response_code());
EXPECT_EQ(parsed->GetContentLength(), recreated->GetContentLength());
EXPECT_EQ(parsed->IsKeepAlive(), recreated->IsKeepAlive());
-
- std::string normalized_parsed;
- parsed->GetNormalizedHeaders(&normalized_parsed);
- std::string normalized_recreated;
- parsed->GetNormalizedHeaders(&normalized_recreated);
- EXPECT_EQ(normalized_parsed, normalized_recreated);
}
TEST_F(HttpResponseHeadersCacheControlTest, AbsentMaxAgeReturnsFalse) {
« google_apis/drive/base_requests.cc ('K') | « net/http/http_response_headers.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698