| Index: net/http/http_response_headers.cc
|
| diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc
|
| index 69a0aa854440630fffd7572b9fc23250718c6047..bfcbf21d0efde7652344be5dc413e16dfd1ba6eb 100644
|
| --- a/net/http/http_response_headers.cc
|
| +++ b/net/http/http_response_headers.cc
|
| @@ -98,12 +98,12 @@ const char* const kNonUpdatedHeaderPrefixes[] = {
|
| bool ShouldUpdateHeader(const std::string::const_iterator& name_begin,
|
| const std::string::const_iterator& name_end) {
|
| for (size_t i = 0; i < arraysize(kNonUpdatedHeaders); ++i) {
|
| - if (LowerCaseEqualsASCII(name_begin, name_end, kNonUpdatedHeaders[i]))
|
| + if (base::LowerCaseEqualsASCII(name_begin, name_end, kNonUpdatedHeaders[i]))
|
| return false;
|
| }
|
| for (size_t i = 0; i < arraysize(kNonUpdatedHeaderPrefixes); ++i) {
|
| - if (StartsWithASCII(std::string(name_begin, name_end),
|
| - kNonUpdatedHeaderPrefixes[i], false))
|
| + if (base::StartsWithASCII(std::string(name_begin, name_end),
|
| + kNonUpdatedHeaderPrefixes[i], false))
|
| return false;
|
| }
|
| return true;
|
| @@ -156,14 +156,15 @@ HttpResponseHeaders::HttpResponseHeaders(const std::string& raw_input)
|
| HttpUtil::GetStatusCodesForHistogram());
|
| }
|
|
|
| -HttpResponseHeaders::HttpResponseHeaders(PickleIterator* iter)
|
| +HttpResponseHeaders::HttpResponseHeaders(base::PickleIterator* iter)
|
| : response_code_(-1) {
|
| std::string raw_input;
|
| if (iter->ReadString(&raw_input))
|
| Parse(raw_input);
|
| }
|
|
|
| -void HttpResponseHeaders::Persist(Pickle* pickle, PersistOptions options) {
|
| +void HttpResponseHeaders::Persist(base::Pickle* pickle,
|
| + PersistOptions options) {
|
| if (options == PERSIST_RAW) {
|
| pickle->WriteString(raw_headers_);
|
| return; // Done.
|
| @@ -603,7 +604,7 @@ bool HttpResponseHeaders::HasHeaderValue(const base::StringPiece& name,
|
| while (EnumerateHeader(&iter, name, &temp)) {
|
| if (value.size() == temp.size() &&
|
| std::equal(temp.begin(), temp.end(), value.begin(),
|
| - base::CaseInsensitiveCompare<char>()))
|
| + base::CaseInsensitiveCompareASCII<char>()))
|
| return true;
|
| }
|
| return false;
|
| @@ -631,7 +632,7 @@ HttpVersion HttpResponseHeaders::ParseVersion(
|
| // TODO: (1*DIGIT apparently means one or more digits, but we only handle 1).
|
| // TODO: handle leading zeros, which is allowed by the rfc1616 sec 3.1.
|
|
|
| - if ((line_end - p < 4) || !LowerCaseEqualsASCII(p, p + 4, "http")) {
|
| + if ((line_end - p < 4) || !base::LowerCaseEqualsASCII(p, p + 4, "http")) {
|
| DVLOG(1) << "missing status line";
|
| return HttpVersion();
|
| }
|
| @@ -745,7 +746,7 @@ size_t HttpResponseHeaders::FindHeader(size_t from,
|
| const std::string::const_iterator& name_end = parsed_[i].name_end;
|
| if (static_cast<size_t>(name_end - name_begin) == search.size() &&
|
| std::equal(name_begin, name_end, search.begin(),
|
| - base::CaseInsensitiveCompare<char>()))
|
| + base::CaseInsensitiveCompareASCII<char>()))
|
| return i;
|
| }
|
|
|
| @@ -762,9 +763,8 @@ bool HttpResponseHeaders::GetCacheControlDirective(const StringPiece& directive,
|
| void* iter = NULL;
|
| while (EnumerateHeader(&iter, name, &value)) {
|
| if (value.size() > directive_size + 1 &&
|
| - LowerCaseEqualsASCII(value.begin(),
|
| - value.begin() + directive_size,
|
| - directive.begin()) &&
|
| + base::LowerCaseEqualsASCII(
|
| + value.begin(), value.begin() + directive_size, directive.begin()) &&
|
| value[directive_size] == '=') {
|
| int64 seconds;
|
| base::StringToInt64(
|
| @@ -1231,7 +1231,7 @@ bool HttpResponseHeaders::IsKeepAlive() const {
|
| std::string token;
|
| while (EnumerateHeader(&iterator, header, &token)) {
|
| for (const KeepAliveToken& keep_alive_token : kKeepAliveTokens) {
|
| - if (LowerCaseEqualsASCII(token, keep_alive_token.token))
|
| + if (base::LowerCaseEqualsASCII(token, keep_alive_token.token))
|
| return keep_alive_token.keep_alive;
|
| }
|
| }
|
| @@ -1308,9 +1308,8 @@ bool HttpResponseHeaders::GetContentRange(int64* first_byte_position,
|
| std::string::const_iterator content_range_spec_end =
|
| content_range_spec.begin() + space_position;
|
| HttpUtil::TrimLWS(&content_range_spec_begin, &content_range_spec_end);
|
| - if (!LowerCaseEqualsASCII(content_range_spec_begin,
|
| - content_range_spec_end,
|
| - "bytes")) {
|
| + if (!base::LowerCaseEqualsASCII(content_range_spec_begin,
|
| + content_range_spec_end, "bytes")) {
|
| return false;
|
| }
|
|
|
| @@ -1329,7 +1328,7 @@ bool HttpResponseHeaders::GetContentRange(int64* first_byte_position,
|
| std::string byte_range_resp_spec(byte_range_resp_spec_begin,
|
| byte_range_resp_spec_end);
|
| // If byte-range-resp-spec != "*".
|
| - if (!LowerCaseEqualsASCII(byte_range_resp_spec, "*")) {
|
| + if (!base::LowerCaseEqualsASCII(byte_range_resp_spec, "*")) {
|
| size_t minus_position = byte_range_resp_spec.find('-');
|
| if (minus_position != std::string::npos) {
|
| // Obtain first-byte-pos.
|
| @@ -1373,7 +1372,8 @@ bool HttpResponseHeaders::GetContentRange(int64* first_byte_position,
|
| content_range_spec.end();
|
| HttpUtil::TrimLWS(&instance_length_begin, &instance_length_end);
|
|
|
| - if (LowerCaseEqualsASCII(instance_length_begin, instance_length_end, "*")) {
|
| + if (base::LowerCaseEqualsASCII(instance_length_begin, instance_length_end,
|
| + "*")) {
|
| return false;
|
| } else if (!base::StringToInt64(StringPiece(instance_length_begin,
|
| instance_length_end),
|
|
|