diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-07-01 09:12:40 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 11:48:14 +0100 |
| commit | d63811d1eddf59024128f9cf3e268964c03a5e07 (patch) | |
| tree | f1b295e59a08c934b7c1be70c3a0aa367aa56b8a | |
| parent | 4867b454ea2a16e397c7e3d8730be96dc5e41ba6 (diff) | |
| download | qtwebengine-chromium-d63811d1eddf59024128f9cf3e268964c03a5e07.tar.gz | |
FIXUP: [Extensions] Remove string literal conversions by ASCIIToUTF16()
See upstream: https://chromium-review.googlesource.com/c/chromium/src/+/3295406
Change-Id: I455ae8151a44e7ae81513df7caae8048d4d0cf9e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
3 files changed, 4 insertions, 5 deletions
diff --git a/chromium/extensions/common/manifest_constants.cc b/chromium/extensions/common/manifest_constants.cc index 94396eca440..10ff4039bb4 100644 --- a/chromium/extensions/common/manifest_constants.cc +++ b/chromium/extensions/common/manifest_constants.cc @@ -647,8 +647,8 @@ const char kManifestVersionTooHighWarning[] = "Certain features may not work as expected."; const char kMissingFile[] = "At least one js or css file is required for 'content_scripts[*]'."; -const char kMatchOriginAsFallbackCantHavePaths[] = - "The path component for scripts with 'match_origin_as_fallback' must be " +const char16_t kMatchOriginAsFallbackCantHavePaths[] = + u"The path component for scripts with 'match_origin_as_fallback' must be " "'*'."; const char kMatchOriginAsFallbackRestrictedToMV3[] = "The 'match_origin_as_fallback' property is restricted to extensions with " diff --git a/chromium/extensions/common/manifest_constants.h b/chromium/extensions/common/manifest_constants.h index 62ab91059d6..67fb3ffe386 100644 --- a/chromium/extensions/common/manifest_constants.h +++ b/chromium/extensions/common/manifest_constants.h @@ -438,7 +438,7 @@ extern const char kManifestParseError[]; extern const char kManifestUnreadable[]; extern const char kManifestV2IsDeprecatedWarning[]; extern const char kManifestVersionTooHighWarning[]; -extern const char kMatchOriginAsFallbackCantHavePaths[]; +extern const char16_t kMatchOriginAsFallbackCantHavePaths[]; extern const char kMatchOriginAsFallbackRestrictedToMV3[]; extern const char kMissingFile[]; extern const char16_t kMultipleOverrides[]; diff --git a/chromium/extensions/common/manifest_handlers/content_scripts_handler.cc b/chromium/extensions/common/manifest_handlers/content_scripts_handler.cc index ab24478619e..df2b7fae002 100644 --- a/chromium/extensions/common/manifest_handlers/content_scripts_handler.cc +++ b/chromium/extensions/common/manifest_handlers/content_scripts_handler.cc @@ -125,8 +125,7 @@ std::unique_ptr<UserScript> CreateUserScript( if (match_origin_as_fallback == MatchOriginAsFallbackBehavior::kAlways) { for (const auto& pattern : result->url_patterns()) { if (pattern.path() != "/*") { - *error = - base::ASCIIToUTF16(errors::kMatchOriginAsFallbackCantHavePaths); + *error = errors::kMatchOriginAsFallbackCantHavePaths; return nullptr; } } |