0

[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:
Hayato Ito
2023-12-13 10:01:41 +00:00
committed by Chromium LUCI CQ
parent ea239cb04a
commit 08f24b9178
8 changed files with 40 additions and 52 deletions

@@ -55,7 +55,7 @@ bool CanonicalizeWebFacetURI(const std::string& input_uri,
url::StdStringCanonOutput canonical_output(canonical_uri); url::StdStringCanonOutput canonical_output(canonical_uri);
bool canonicalization_succeeded = url::CanonicalizeStandardURL( 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, url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr,
&canonical_output, &canonical_parsed); &canonical_output, &canonical_parsed);
canonical_output.Complete(); canonical_output.Complete();

@@ -30,10 +30,9 @@ absl::optional<std::string> GetHttpsHost(const std::string& url) {
std::string canonical; std::string canonical;
url::StdStringCanonOutput output(&canonical); url::StdStringCanonOutput output(&canonical);
url::Parsed canonical_parsed; url::Parsed canonical_parsed;
bool is_valid = bool is_valid = url::CanonicalizeStandardURL(
url::CanonicalizeStandardURL(url.data(), url.size(), parsed, url.data(), parsed, url::SchemeType::SCHEME_WITH_HOST_AND_PORT, nullptr,
url::SchemeType::SCHEME_WITH_HOST_AND_PORT, &output, &canonical_parsed);
nullptr, &output, &canonical_parsed);
if (!is_valid) if (!is_valid)
return absl::nullopt; return absl::nullopt;
const url::Component& scheme_range = canonical_parsed.scheme; 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. // Use for standard URLs with authorities and paths.
COMPONENT_EXPORT(URL) COMPONENT_EXPORT(URL)
bool CanonicalizeStandardURL(const char* spec, bool CanonicalizeStandardURL(const char* spec,
int spec_len,
const Parsed& parsed, const Parsed& parsed,
SchemeType scheme_type, SchemeType scheme_type,
CharsetConverter* query_converter, CharsetConverter* query_converter,
@@ -707,7 +706,6 @@ bool CanonicalizeStandardURL(const char* spec,
Parsed* new_parsed); Parsed* new_parsed);
COMPONENT_EXPORT(URL) COMPONENT_EXPORT(URL)
bool CanonicalizeStandardURL(const char16_t* spec, bool CanonicalizeStandardURL(const char16_t* spec,
int spec_len,
const Parsed& parsed, const Parsed& parsed,
SchemeType scheme_type, SchemeType scheme_type,
CharsetConverter* query_converter, CharsetConverter* query_converter,
@@ -749,14 +747,12 @@ bool CanonicalizeFileURL(const char16_t* spec,
// Use for filesystem URLs. // Use for filesystem URLs.
COMPONENT_EXPORT(URL) COMPONENT_EXPORT(URL)
bool CanonicalizeFileSystemURL(const char* spec, bool CanonicalizeFileSystemURL(const char* spec,
int spec_len,
const Parsed& parsed, const Parsed& parsed,
CharsetConverter* query_converter, CharsetConverter* query_converter,
CanonOutput* output, CanonOutput* output,
Parsed* new_parsed); Parsed* new_parsed);
COMPONENT_EXPORT(URL) COMPONENT_EXPORT(URL)
bool CanonicalizeFileSystemURL(const char16_t* spec, bool CanonicalizeFileSystemURL(const char16_t* spec,
int spec_len,
const Parsed& parsed, const Parsed& parsed,
CharsetConverter* query_converter, CharsetConverter* query_converter,
CanonOutput* output, CanonOutput* output,

@@ -17,7 +17,7 @@ namespace {
// We use the URLComponentSource for the outer URL, as it can have replacements, // We use the URLComponentSource for the outer URL, as it can have replacements,
// whereas the inner_url can't, so it uses spec. // whereas the inner_url can't, so it uses spec.
template<typename CHAR, typename UCHAR> template <typename CHAR>
bool DoCanonicalizeFileSystemURL(const CHAR* spec, bool DoCanonicalizeFileSystemURL(const CHAR* spec,
const URLComponentSource<CHAR>& source, const URLComponentSource<CHAR>& source,
const Parsed& parsed, const Parsed& parsed,
@@ -56,9 +56,9 @@ bool DoCanonicalizeFileSystemURL(const CHAR* spec,
// Strip out the user information from the inner URL, if any. // Strip out the user information from the inner URL, if any.
inner_scheme_type = SCHEME_WITH_HOST_AND_PORT; inner_scheme_type = SCHEME_WITH_HOST_AND_PORT;
} }
success = CanonicalizeStandardURL( success =
spec, inner_parsed->Length(), *inner_parsed, inner_scheme_type, CanonicalizeStandardURL(spec, *inner_parsed, inner_scheme_type,
charset_converter, output, &new_inner_parsed); charset_converter, output, &new_inner_parsed);
} else { } else {
// TODO(ericu): The URL is wrong, but should we try to output more of what // 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 // we were given? Echoing back filesystem:mailto etc. doesn't seem all that
@@ -84,25 +84,21 @@ bool DoCanonicalizeFileSystemURL(const CHAR* spec,
} // namespace } // namespace
bool CanonicalizeFileSystemURL(const char* spec, bool CanonicalizeFileSystemURL(const char* spec,
int spec_len,
const Parsed& parsed, const Parsed& parsed,
CharsetConverter* charset_converter, CharsetConverter* charset_converter,
CanonOutput* output, CanonOutput* output,
Parsed* new_parsed) { Parsed* new_parsed) {
return DoCanonicalizeFileSystemURL<char, unsigned char>( return DoCanonicalizeFileSystemURL(spec, URLComponentSource(spec), parsed,
spec, URLComponentSource<char>(spec), parsed, charset_converter, output, charset_converter, output, new_parsed);
new_parsed);
} }
bool CanonicalizeFileSystemURL(const char16_t* spec, bool CanonicalizeFileSystemURL(const char16_t* spec,
int spec_len,
const Parsed& parsed, const Parsed& parsed,
CharsetConverter* charset_converter, CharsetConverter* charset_converter,
CanonOutput* output, CanonOutput* output,
Parsed* new_parsed) { Parsed* new_parsed) {
return DoCanonicalizeFileSystemURL<char16_t, char16_t>( return DoCanonicalizeFileSystemURL(spec, URLComponentSource(spec), parsed,
spec, URLComponentSource<char16_t>(spec), parsed, charset_converter, charset_converter, output, new_parsed);
output, new_parsed);
} }
bool ReplaceFileSystemURL(const char* base, bool ReplaceFileSystemURL(const char* base,
@@ -114,8 +110,8 @@ bool ReplaceFileSystemURL(const char* base,
URLComponentSource<char> source(base); URLComponentSource<char> source(base);
Parsed parsed(base_parsed); Parsed parsed(base_parsed);
SetupOverrideComponents(base, replacements, &source, &parsed); SetupOverrideComponents(base, replacements, &source, &parsed);
return DoCanonicalizeFileSystemURL<char, unsigned char>( return DoCanonicalizeFileSystemURL(base, source, parsed, charset_converter,
base, source, parsed, charset_converter, output, new_parsed); output, new_parsed);
} }
bool ReplaceFileSystemURL(const char* base, bool ReplaceFileSystemURL(const char* base,
@@ -128,8 +124,8 @@ bool ReplaceFileSystemURL(const char* base,
URLComponentSource<char> source(base); URLComponentSource<char> source(base);
Parsed parsed(base_parsed); Parsed parsed(base_parsed);
SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed); SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed);
return DoCanonicalizeFileSystemURL<char, unsigned char>( return DoCanonicalizeFileSystemURL(base, source, parsed, charset_converter,
base, source, parsed, charset_converter, output, new_parsed); output, new_parsed);
} }
} // namespace url } // namespace url

@@ -13,7 +13,7 @@ namespace url {
namespace { namespace {
template <typename CHAR, typename UCHAR> template <typename CHAR>
bool DoCanonicalizeStandardURL(const URLComponentSource<CHAR>& source, bool DoCanonicalizeStandardURL(const URLComponentSource<CHAR>& source,
const Parsed& parsed, const Parsed& parsed,
SchemeType scheme_type, SchemeType scheme_type,
@@ -145,27 +145,25 @@ int DefaultPortForScheme(const char* scheme, int scheme_len) {
} }
bool CanonicalizeStandardURL(const char* spec, bool CanonicalizeStandardURL(const char* spec,
int spec_len,
const Parsed& parsed, const Parsed& parsed,
SchemeType scheme_type, SchemeType scheme_type,
CharsetConverter* query_converter, CharsetConverter* query_converter,
CanonOutput* output, CanonOutput* output,
Parsed* new_parsed) { Parsed* new_parsed) {
return DoCanonicalizeStandardURL<char, unsigned char>( return DoCanonicalizeStandardURL(URLComponentSource(spec), parsed,
URLComponentSource<char>(spec), parsed, scheme_type, query_converter, scheme_type, query_converter, output,
output, new_parsed); new_parsed);
} }
bool CanonicalizeStandardURL(const char16_t* spec, bool CanonicalizeStandardURL(const char16_t* spec,
int spec_len,
const Parsed& parsed, const Parsed& parsed,
SchemeType scheme_type, SchemeType scheme_type,
CharsetConverter* query_converter, CharsetConverter* query_converter,
CanonOutput* output, CanonOutput* output,
Parsed* new_parsed) { Parsed* new_parsed) {
return DoCanonicalizeStandardURL<char16_t, char16_t>( return DoCanonicalizeStandardURL(URLComponentSource(spec), parsed,
URLComponentSource<char16_t>(spec), parsed, scheme_type, query_converter, scheme_type, query_converter, output,
output, new_parsed); new_parsed);
} }
// It might be nice in the future to optimize this so unchanged components don't // 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); URLComponentSource<char> source(base);
Parsed parsed(base_parsed); Parsed parsed(base_parsed);
SetupOverrideComponents(base, replacements, &source, &parsed); SetupOverrideComponents(base, replacements, &source, &parsed);
return DoCanonicalizeStandardURL<char, unsigned char>( return DoCanonicalizeStandardURL(source, parsed, scheme_type, query_converter,
source, parsed, scheme_type, query_converter, output, new_parsed); output, new_parsed);
} }
// For 16-bit replacements, we turn all the replacements into UTF-8 so the // 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); URLComponentSource<char> source(base);
Parsed parsed(base_parsed); Parsed parsed(base_parsed);
SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed); SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed);
return DoCanonicalizeStandardURL<char, unsigned char>( return DoCanonicalizeStandardURL(source, parsed, scheme_type, query_converter,
source, parsed, scheme_type, query_converter, output, new_parsed); output, new_parsed);
} }
} // namespace url } // namespace url

@@ -1769,8 +1769,8 @@ TEST(URLCanonTest, CanonicalizeStandardURL) {
std::string out_str; std::string out_str;
StdStringCanonOutput output(&out_str); StdStringCanonOutput output(&out_str);
bool success = CanonicalizeStandardURL( bool success = CanonicalizeStandardURL(
i.input, url_len, parsed, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, i.input, parsed, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr,
nullptr, &output, &out_parsed); &output, &out_parsed);
output.Complete(); output.Complete();
EXPECT_EQ(i.expected_success, success); EXPECT_EQ(i.expected_success, success);
@@ -2342,8 +2342,8 @@ TEST(URLCanonTest, CanonicalizeFileSystemURL) {
Parsed out_parsed; Parsed out_parsed;
std::string out_str; std::string out_str;
StdStringCanonOutput output(&out_str); StdStringCanonOutput output(&out_str);
bool success = CanonicalizeFileSystemURL(i.input, url_len, parsed, nullptr, bool success = CanonicalizeFileSystemURL(i.input, parsed, nullptr, &output,
&output, &out_parsed); &out_parsed);
output.Complete(); output.Complete();
EXPECT_EQ(i.expected_success, success); EXPECT_EQ(i.expected_success, success);

@@ -66,21 +66,21 @@ TEST(URLParse, TypicalURLParseCanon) {
url::ParseStandardURL(kTypicalUrl1.data(), kTypicalUrl1.size(), &parsed1); url::ParseStandardURL(kTypicalUrl1.data(), kTypicalUrl1.size(), &parsed1);
output.set_length(0); output.set_length(0);
url::CanonicalizeStandardURL( url::CanonicalizeStandardURL(
kTypicalUrl1.data(), kTypicalUrl1.size(), parsed1, kTypicalUrl1.data(), parsed1,
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output, url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output,
&out_parsed); &out_parsed);
url::ParseStandardURL(kTypicalUrl2.data(), kTypicalUrl2.size(), &parsed2); url::ParseStandardURL(kTypicalUrl2.data(), kTypicalUrl2.size(), &parsed2);
output.set_length(0); output.set_length(0);
url::CanonicalizeStandardURL( url::CanonicalizeStandardURL(
kTypicalUrl2.data(), kTypicalUrl2.size(), parsed2, kTypicalUrl2.data(), parsed2,
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output, url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output,
&out_parsed); &out_parsed);
url::ParseStandardURL(kTypicalUrl3.data(), kTypicalUrl3.size(), &parsed3); url::ParseStandardURL(kTypicalUrl3.data(), kTypicalUrl3.size(), &parsed3);
output.set_length(0); output.set_length(0);
url::CanonicalizeStandardURL( url::CanonicalizeStandardURL(
kTypicalUrl3.data(), kTypicalUrl3.size(), parsed3, kTypicalUrl3.data(), parsed3,
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output, url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output,
&out_parsed); &out_parsed);
} }
@@ -100,7 +100,7 @@ TEST(URLParse, TypicalURLParseCanonStdString) {
std::string out1; std::string out1;
url::StdStringCanonOutput output1(&out1); url::StdStringCanonOutput output1(&out1);
url::CanonicalizeStandardURL( url::CanonicalizeStandardURL(
kTypicalUrl1.data(), kTypicalUrl1.size(), parsed1, kTypicalUrl1.data(), parsed1,
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output1, url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output1,
&out_parsed); &out_parsed);
@@ -108,7 +108,7 @@ TEST(URLParse, TypicalURLParseCanonStdString) {
std::string out2; std::string out2;
url::StdStringCanonOutput output2(&out2); url::StdStringCanonOutput output2(&out2);
url::CanonicalizeStandardURL( url::CanonicalizeStandardURL(
kTypicalUrl2.data(), kTypicalUrl2.size(), parsed2, kTypicalUrl2.data(), parsed2,
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output2, url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output2,
&out_parsed); &out_parsed);
@@ -116,7 +116,7 @@ TEST(URLParse, TypicalURLParseCanonStdString) {
std::string out3; std::string out3;
url::StdStringCanonOutput output3(&out3); url::StdStringCanonOutput output3(&out3);
url::CanonicalizeStandardURL( url::CanonicalizeStandardURL(
kTypicalUrl3.data(), kTypicalUrl3.size(), parsed3, kTypicalUrl3.data(), parsed3,
url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output3, url::SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION, nullptr, &output3,
&out_parsed); &out_parsed);
} }

@@ -273,14 +273,13 @@ bool DoCanonicalize(const CHAR* spec,
} else if (DoCompareSchemeComponent(spec, scheme, url::kFileSystemScheme)) { } else if (DoCompareSchemeComponent(spec, scheme, url::kFileSystemScheme)) {
// Filesystem URLs are special. // Filesystem URLs are special.
ParseFileSystemURL(spec, spec_len, &parsed_input); ParseFileSystemURL(spec, spec_len, &parsed_input);
success = CanonicalizeFileSystemURL(spec, spec_len, parsed_input, success = CanonicalizeFileSystemURL(spec, parsed_input, charset_converter,
charset_converter, output, output, output_parsed);
output_parsed);
} else if (DoIsStandard(spec, scheme, &scheme_type)) { } else if (DoIsStandard(spec, scheme, &scheme_type)) {
// All "normal" URLs. // All "normal" URLs.
ParseStandardURL(spec, spec_len, &parsed_input); 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); charset_converter, output, output_parsed);
} else if (DoCompareSchemeComponent(spec, scheme, url::kMailToScheme)) { } else if (DoCompareSchemeComponent(spec, scheme, url::kMailToScheme)) {