| Index: components/url_formatter/url_fixer.cc
|
| diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
|
| index 54ff17f168c1d7e4e2ac9647e4831057fb60e1bb..04092636ec1acfc022b89d6f802fcc6b9d31b530 100644
|
| --- a/components/url_formatter/url_fixer.cc
|
| +++ b/components/url_formatter/url_fixer.cc
|
| @@ -187,7 +187,7 @@ std::string FixupPath(const std::string& text) {
|
| GURL file_url = net::FilePathToFileURL(base::FilePath(filename));
|
| if (file_url.is_valid()) {
|
| return base::UTF16ToUTF8(url_formatter::FormatUrl(
|
| - file_url, std::string(), url_formatter::kFormatUrlOmitUsernamePassword,
|
| + file_url, url_formatter::kFormatUrlOmitUsernamePassword,
|
| net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr));
|
| }
|
|
|
| @@ -641,8 +641,7 @@ GURL FixupRelativeFile(const base::FilePath& base_dir,
|
| GURL file_url = net::FilePathToFileURL(full_path);
|
| if (file_url.is_valid())
|
| return GURL(base::UTF16ToUTF8(url_formatter::FormatUrl(
|
| - file_url, std::string(),
|
| - url_formatter::kFormatUrlOmitUsernamePassword,
|
| + file_url, url_formatter::kFormatUrlOmitUsernamePassword,
|
| net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr)));
|
| // Invalid files fall through to regular processing.
|
| }
|
|
|