[URL] Remove unused parameters
Remove unused parameters and template parameters from: - url::CanonicalizeStandardURL - url::CanonicalizeFileSystemURL - DoCanonicalizeFileSystemURL Bug: 1416006 Change-Id: I40f29d53c947aae6c09b3809a2378ea19c212a0f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5114701 Reviewed-by: Daniel Cheng <dcheng@chromium.org> Reviewed-by: Adam Rice <ricea@chromium.org> Reviewed-by: Viktor Semeniuk <vsemeniuk@google.com> Commit-Queue: Viktor Semeniuk <vsemeniuk@google.com> Auto-Submit: Hayato Ito <hayato@chromium.org> Cr-Commit-Position: refs/heads/main@{#1236868}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
ea239cb04a
commit
08f24b9178
components/password_manager/core/browser/affiliation
net/dns/public
url
@ -55,7 +55,7 @@ bool CanonicalizeWebFacetURI(const std::string& input_uri,
|
||||
url::StdStringCanonOutput canonical_output(canonical_uri);
|
||||
|
||||
bool canonicalization_succeeded = url::CanonicalizeStandardURL(
|
||||
input_uri.c_str(), input_uri.size(), input_parsed,
|
||||
input_uri.c_str(), input_parsed,
|
||||
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr,
|
||||
&canonical_output, &canonical_parsed);
|
||||
canonical_output.Complete();
|
||||
|
@ -30,10 +30,9 @@ absl::optional<std::string> GetHttpsHost(const std::string& url) {
|
||||
std::string canonical;
|
||||
url::StdStringCanonOutput output(&canonical);
|
||||
url::Parsed canonical_parsed;
|
||||
bool is_valid =
|
||||
url::CanonicalizeStandardURL(url.data(), url.size(), parsed,
|
||||
url::SchemeType::SCHEME_WITH_HOST_AND_PORT,
|
||||
nullptr, &output, &canonical_parsed);
|
||||
bool is_valid = url::CanonicalizeStandardURL(
|
||||
url.data(), parsed, url::SchemeType::SCHEME_WITH_HOST_AND_PORT, nullptr,
|
||||
&output, &canonical_parsed);
|
||||
if (!is_valid)
|
||||
return absl::nullopt;
|
||||
const url::Component& scheme_range = canonical_parsed.scheme;
|
||||
|
@ -699,7 +699,6 @@ void CanonicalizeRef(const char16_t* spec,
|
||||
// Use for standard URLs with authorities and paths.
|
||||
COMPONENT_EXPORT(URL)
|
||||
bool CanonicalizeStandardURL(const char* spec,
|
||||
int spec_len,
|
||||
const Parsed& parsed,
|
||||
SchemeType scheme_type,
|
||||
CharsetConverter* query_converter,
|
||||
@ -707,7 +706,6 @@ bool CanonicalizeStandardURL(const char* spec,
|
||||
Parsed* new_parsed);
|
||||
COMPONENT_EXPORT(URL)
|
||||
bool CanonicalizeStandardURL(const char16_t* spec,
|
||||
int spec_len,
|
||||
const Parsed& parsed,
|
||||
SchemeType scheme_type,
|
||||
CharsetConverter* query_converter,
|
||||
@ -749,14 +747,12 @@ bool CanonicalizeFileURL(const char16_t* spec,
|
||||
// Use for filesystem URLs.
|
||||
COMPONENT_EXPORT(URL)
|
||||
bool CanonicalizeFileSystemURL(const char* spec,
|
||||
int spec_len,
|
||||
const Parsed& parsed,
|
||||
CharsetConverter* query_converter,
|
||||
CanonOutput* output,
|
||||
Parsed* new_parsed);
|
||||
COMPONENT_EXPORT(URL)
|
||||
bool CanonicalizeFileSystemURL(const char16_t* spec,
|
||||
int spec_len,
|
||||
const Parsed& parsed,
|
||||
CharsetConverter* query_converter,
|
||||
CanonOutput* output,
|
||||
|
@ -17,7 +17,7 @@ namespace {
|
||||
|
||||
// We use the URLComponentSource for the outer URL, as it can have replacements,
|
||||
// whereas the inner_url can't, so it uses spec.
|
||||
template<typename CHAR, typename UCHAR>
|
||||
template <typename CHAR>
|
||||
bool DoCanonicalizeFileSystemURL(const CHAR* spec,
|
||||
const URLComponentSource<CHAR>& source,
|
||||
const Parsed& parsed,
|
||||
@ -56,9 +56,9 @@ bool DoCanonicalizeFileSystemURL(const CHAR* spec,
|
||||
// Strip out the user information from the inner URL, if any.
|
||||
inner_scheme_type = SCHEME_WITH_HOST_AND_PORT;
|
||||
}
|
||||
success = CanonicalizeStandardURL(
|
||||
spec, inner_parsed->Length(), *inner_parsed, inner_scheme_type,
|
||||
charset_converter, output, &new_inner_parsed);
|
||||
success =
|
||||
CanonicalizeStandardURL(spec, *inner_parsed, inner_scheme_type,
|
||||
charset_converter, output, &new_inner_parsed);
|
||||
} else {
|
||||
// TODO(ericu): The URL is wrong, but should we try to output more of what
|
||||
// we were given? Echoing back filesystem:mailto etc. doesn't seem all that
|
||||
@ -84,25 +84,21 @@ bool DoCanonicalizeFileSystemURL(const CHAR* spec,
|
||||
} // namespace
|
||||
|
||||
bool CanonicalizeFileSystemURL(const char* spec,
|
||||
int spec_len,
|
||||
const Parsed& parsed,
|
||||
CharsetConverter* charset_converter,
|
||||
CanonOutput* output,
|
||||
Parsed* new_parsed) {
|
||||
return DoCanonicalizeFileSystemURL<char, unsigned char>(
|
||||
spec, URLComponentSource<char>(spec), parsed, charset_converter, output,
|
||||
new_parsed);
|
||||
return DoCanonicalizeFileSystemURL(spec, URLComponentSource(spec), parsed,
|
||||
charset_converter, output, new_parsed);
|
||||
}
|
||||
|
||||
bool CanonicalizeFileSystemURL(const char16_t* spec,
|
||||
int spec_len,
|
||||
const Parsed& parsed,
|
||||
CharsetConverter* charset_converter,
|
||||
CanonOutput* output,
|
||||
Parsed* new_parsed) {
|
||||
return DoCanonicalizeFileSystemURL<char16_t, char16_t>(
|
||||
spec, URLComponentSource<char16_t>(spec), parsed, charset_converter,
|
||||
output, new_parsed);
|
||||
return DoCanonicalizeFileSystemURL(spec, URLComponentSource(spec), parsed,
|
||||
charset_converter, output, new_parsed);
|
||||
}
|
||||
|
||||
bool ReplaceFileSystemURL(const char* base,
|
||||
@ -114,8 +110,8 @@ bool ReplaceFileSystemURL(const char* base,
|
||||
URLComponentSource<char> source(base);
|
||||
Parsed parsed(base_parsed);
|
||||
SetupOverrideComponents(base, replacements, &source, &parsed);
|
||||
return DoCanonicalizeFileSystemURL<char, unsigned char>(
|
||||
base, source, parsed, charset_converter, output, new_parsed);
|
||||
return DoCanonicalizeFileSystemURL(base, source, parsed, charset_converter,
|
||||
output, new_parsed);
|
||||
}
|
||||
|
||||
bool ReplaceFileSystemURL(const char* base,
|
||||
@ -128,8 +124,8 @@ bool ReplaceFileSystemURL(const char* base,
|
||||
URLComponentSource<char> source(base);
|
||||
Parsed parsed(base_parsed);
|
||||
SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed);
|
||||
return DoCanonicalizeFileSystemURL<char, unsigned char>(
|
||||
base, source, parsed, charset_converter, output, new_parsed);
|
||||
return DoCanonicalizeFileSystemURL(base, source, parsed, charset_converter,
|
||||
output, new_parsed);
|
||||
}
|
||||
|
||||
} // namespace url
|
||||
|
@ -13,7 +13,7 @@ namespace url {
|
||||
|
||||
namespace {
|
||||
|
||||
template <typename CHAR, typename UCHAR>
|
||||
template <typename CHAR>
|
||||
bool DoCanonicalizeStandardURL(const URLComponentSource<CHAR>& source,
|
||||
const Parsed& parsed,
|
||||
SchemeType scheme_type,
|
||||
@ -145,27 +145,25 @@ int DefaultPortForScheme(const char* scheme, int scheme_len) {
|
||||
}
|
||||
|
||||
bool CanonicalizeStandardURL(const char* spec,
|
||||
int spec_len,
|
||||
const Parsed& parsed,
|
||||
SchemeType scheme_type,
|
||||
CharsetConverter* query_converter,
|
||||
CanonOutput* output,
|
||||
Parsed* new_parsed) {
|
||||
return DoCanonicalizeStandardURL<char, unsigned char>(
|
||||
URLComponentSource<char>(spec), parsed, scheme_type, query_converter,
|
||||
output, new_parsed);
|
||||
return DoCanonicalizeStandardURL(URLComponentSource(spec), parsed,
|
||||
scheme_type, query_converter, output,
|
||||
new_parsed);
|
||||
}
|
||||
|
||||
bool CanonicalizeStandardURL(const char16_t* spec,
|
||||
int spec_len,
|
||||
const Parsed& parsed,
|
||||
SchemeType scheme_type,
|
||||
CharsetConverter* query_converter,
|
||||
CanonOutput* output,
|
||||
Parsed* new_parsed) {
|
||||
return DoCanonicalizeStandardURL<char16_t, char16_t>(
|
||||
URLComponentSource<char16_t>(spec), parsed, scheme_type, query_converter,
|
||||
output, new_parsed);
|
||||
return DoCanonicalizeStandardURL(URLComponentSource(spec), parsed,
|
||||
scheme_type, query_converter, output,
|
||||
new_parsed);
|
||||
}
|
||||
|
||||
// It might be nice in the future to optimize this so unchanged components don't
|
||||
@ -187,8 +185,8 @@ bool ReplaceStandardURL(const char* base,
|
||||
URLComponentSource<char> source(base);
|
||||
Parsed parsed(base_parsed);
|
||||
SetupOverrideComponents(base, replacements, &source, &parsed);
|
||||
return DoCanonicalizeStandardURL<char, unsigned char>(
|
||||
source, parsed, scheme_type, query_converter, output, new_parsed);
|
||||
return DoCanonicalizeStandardURL(source, parsed, scheme_type, query_converter,
|
||||
output, new_parsed);
|
||||
}
|
||||
|
||||
// For 16-bit replacements, we turn all the replacements into UTF-8 so the
|
||||
@ -204,8 +202,8 @@ bool ReplaceStandardURL(const char* base,
|
||||
URLComponentSource<char> source(base);
|
||||
Parsed parsed(base_parsed);
|
||||
SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed);
|
||||
return DoCanonicalizeStandardURL<char, unsigned char>(
|
||||
source, parsed, scheme_type, query_converter, output, new_parsed);
|
||||
return DoCanonicalizeStandardURL(source, parsed, scheme_type, query_converter,
|
||||
output, new_parsed);
|
||||
}
|
||||
|
||||
} // namespace url
|
||||
|
@ -1769,8 +1769,8 @@ TEST(URLCanonTest, CanonicalizeStandardURL) {
|
||||
std::string out_str;
|
||||
StdStringCanonOutput output(&out_str);
|
||||
bool success = CanonicalizeStandardURL(
|
||||
i.input, url_len, parsed, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION,
|
||||
nullptr, &output, &out_parsed);
|
||||
i.input, parsed, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr,
|
||||
&output, &out_parsed);
|
||||
output.Complete();
|
||||
|
||||
EXPECT_EQ(i.expected_success, success);
|
||||
@ -2342,8 +2342,8 @@ TEST(URLCanonTest, CanonicalizeFileSystemURL) {
|
||||
Parsed out_parsed;
|
||||
std::string out_str;
|
||||
StdStringCanonOutput output(&out_str);
|
||||
bool success = CanonicalizeFileSystemURL(i.input, url_len, parsed, nullptr,
|
||||
&output, &out_parsed);
|
||||
bool success = CanonicalizeFileSystemURL(i.input, parsed, nullptr, &output,
|
||||
&out_parsed);
|
||||
output.Complete();
|
||||
|
||||
EXPECT_EQ(i.expected_success, success);
|
||||
|
@ -66,21 +66,21 @@ TEST(URLParse, TypicalURLParseCanon) {
|
||||
url::ParseStandardURL(kTypicalUrl1.data(), kTypicalUrl1.size(), &parsed1);
|
||||
output.set_length(0);
|
||||
url::CanonicalizeStandardURL(
|
||||
kTypicalUrl1.data(), kTypicalUrl1.size(), parsed1,
|
||||
kTypicalUrl1.data(), parsed1,
|
||||
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output,
|
||||
&out_parsed);
|
||||
|
||||
url::ParseStandardURL(kTypicalUrl2.data(), kTypicalUrl2.size(), &parsed2);
|
||||
output.set_length(0);
|
||||
url::CanonicalizeStandardURL(
|
||||
kTypicalUrl2.data(), kTypicalUrl2.size(), parsed2,
|
||||
kTypicalUrl2.data(), parsed2,
|
||||
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output,
|
||||
&out_parsed);
|
||||
|
||||
url::ParseStandardURL(kTypicalUrl3.data(), kTypicalUrl3.size(), &parsed3);
|
||||
output.set_length(0);
|
||||
url::CanonicalizeStandardURL(
|
||||
kTypicalUrl3.data(), kTypicalUrl3.size(), parsed3,
|
||||
kTypicalUrl3.data(), parsed3,
|
||||
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output,
|
||||
&out_parsed);
|
||||
}
|
||||
@ -100,7 +100,7 @@ TEST(URLParse, TypicalURLParseCanonStdString) {
|
||||
std::string out1;
|
||||
url::StdStringCanonOutput output1(&out1);
|
||||
url::CanonicalizeStandardURL(
|
||||
kTypicalUrl1.data(), kTypicalUrl1.size(), parsed1,
|
||||
kTypicalUrl1.data(), parsed1,
|
||||
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output1,
|
||||
&out_parsed);
|
||||
|
||||
@ -108,7 +108,7 @@ TEST(URLParse, TypicalURLParseCanonStdString) {
|
||||
std::string out2;
|
||||
url::StdStringCanonOutput output2(&out2);
|
||||
url::CanonicalizeStandardURL(
|
||||
kTypicalUrl2.data(), kTypicalUrl2.size(), parsed2,
|
||||
kTypicalUrl2.data(), parsed2,
|
||||
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output2,
|
||||
&out_parsed);
|
||||
|
||||
@ -116,7 +116,7 @@ TEST(URLParse, TypicalURLParseCanonStdString) {
|
||||
std::string out3;
|
||||
url::StdStringCanonOutput output3(&out3);
|
||||
url::CanonicalizeStandardURL(
|
||||
kTypicalUrl3.data(), kTypicalUrl3.size(), parsed3,
|
||||
kTypicalUrl3.data(), parsed3,
|
||||
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output3,
|
||||
&out_parsed);
|
||||
}
|
||||
|
@ -273,14 +273,13 @@ bool DoCanonicalize(const CHAR* spec,
|
||||
} else if (DoCompareSchemeComponent(spec, scheme, url::kFileSystemScheme)) {
|
||||
// Filesystem URLs are special.
|
||||
ParseFileSystemURL(spec, spec_len, &parsed_input);
|
||||
success = CanonicalizeFileSystemURL(spec, spec_len, parsed_input,
|
||||
charset_converter, output,
|
||||
output_parsed);
|
||||
success = CanonicalizeFileSystemURL(spec, parsed_input, charset_converter,
|
||||
output, output_parsed);
|
||||
|
||||
} else if (DoIsStandard(spec, scheme, &scheme_type)) {
|
||||
// All "normal" URLs.
|
||||
ParseStandardURL(spec, spec_len, &parsed_input);
|
||||
success = CanonicalizeStandardURL(spec, spec_len, parsed_input, scheme_type,
|
||||
success = CanonicalizeStandardURL(spec, parsed_input, scheme_type,
|
||||
charset_converter, output, output_parsed);
|
||||
|
||||
} else if (DoCompareSchemeComponent(spec, scheme, url::kMailToScheme)) {
|
||||
|
Reference in New Issue
Block a user