diff --git a/browser/farbling/brave_font_whitelist_browsertest.cc b/browser/farbling/brave_font_whitelist_browsertest.cc index 6f44c62033d..84cd1274e98 100644 --- a/browser/farbling/brave_font_whitelist_browsertest.cc +++ b/browser/farbling/brave_font_whitelist_browsertest.cc @@ -85,10 +85,10 @@ TEST_F(BraveFontWhitelistRenderViewTest, MAYBE_FontLocalSource) { LoadHTMLWithUrlOverride(kFontLocalSourceHTML, GURL("http://b.test/").spec()); blink::WebDocument document = GetMainFrame()->GetDocument(); blink::WebElement p1 = - document.GetElementById(blink::WebString::FromUTF8("test1")); + document.GetElementById(blink::WebString::FromUtf8("test1")); ASSERT_FALSE(p1.IsNull()); blink::WebElement p2 = - document.GetElementById(blink::WebString::FromUTF8("test2")); + document.GetElementById(blink::WebString::FromUtf8("test2")); ASSERT_FALSE(p2.IsNull()); // If the width of both spans is the same, that means they were both blocked diff --git a/components/ai_chat/renderer/page_text_distilling.cc b/components/ai_chat/renderer/page_text_distilling.cc index bad9d3f5caa..9209b9f773d 100644 --- a/components/ai_chat/renderer/page_text_distilling.cc +++ b/components/ai_chat/renderer/page_text_distilling.cc @@ -235,7 +235,7 @@ void DistillPageTextViaSiteScript( std::string script = absl::StrFormat("{%s\ndistill()}", script_content); blink::WebScriptSource source = - blink::WebScriptSource(blink::WebString::FromUTF8(script)); + blink::WebScriptSource(blink::WebString::FromUtf8(script)); auto on_script_executed = [](base::OnceCallback&)> callback, diff --git a/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc b/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc index 5e1dbe010de..c457825942b 100644 --- a/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc +++ b/components/cosmetic_filters/renderer/cosmetic_filters_js_handler.cc @@ -474,7 +474,7 @@ void CosmeticFiltersJSHandler::InjectStylesheet(const std::string& stylesheet) { blink::WebStyleSheetKey* style_sheet_key = nullptr; blink::WebString stylesheet_webstring = - blink::WebString::FromUTF8(stylesheet); + blink::WebString::FromUtf8(stylesheet); web_frame->GetDocument().InsertStyleSheet( stylesheet_webstring, style_sheet_key, blink::WebCssOrigin::kUser); } @@ -601,7 +601,7 @@ void CosmeticFiltersJSHandler::LaunchContentPicker() { } web_frame->ExecuteScriptInIsolatedWorld( isolated_world_id_, - blink::WebScriptSource(blink::WebString::FromUTF8( + blink::WebScriptSource(blink::WebString::FromUtf8( LoadDataResource(IDR_COSMETIC_FILTERS_ELEMENT_PICKER_BUNDLE_JS))), blink::BackForwardCacheAware::kAllow); } @@ -701,7 +701,7 @@ void CosmeticFiltersJSHandler::ApplyRules(bool de_amp_enabled) { if (!scriptlet_script.empty()) { web_frame->ExecuteScriptInIsolatedWorld( isolated_world_id_, - blink::WebScriptSource(blink::WebString::FromUTF8(scriptlet_script)), + blink::WebScriptSource(blink::WebString::FromUtf8(scriptlet_script)), blink::BackForwardCacheAware::kAllow); } @@ -721,7 +721,7 @@ void CosmeticFiltersJSHandler::ApplyRules(bool de_amp_enabled) { web_frame->ExecuteScriptInIsolatedWorld( isolated_world_id_, - blink::WebScriptSource(blink::WebString::FromUTF8(pre_init_script)), + blink::WebScriptSource(blink::WebString::FromUtf8(pre_init_script)), blink::BackForwardCacheAware::kAllow); ExecuteObservingBundleEntryPoint(); @@ -737,7 +737,7 @@ void CosmeticFiltersJSHandler::ApplyRules(bool de_amp_enabled) { web_frame->ExecuteScriptInIsolatedWorldAndReturnValue( isolated_world_id_, blink::WebScriptSource( - blink::WebString::FromUTF8(*procedural_actions_script)), + blink::WebString::FromUtf8(*procedural_actions_script)), blink::BackForwardCacheAware::kAllow); if (!v8_stylesheet.IsEmpty() && v8_stylesheet->IsString()) { v8::Local v8_str = v8_stylesheet.As(); @@ -796,7 +796,7 @@ void CosmeticFiltersJSHandler::CSSRulesRoutine( web_frame->ExecuteScriptInIsolatedWorld( isolated_world_id_, blink::WebScriptSource( - blink::WebString::FromUTF8(new_selectors_script)), + blink::WebString::FromUtf8(new_selectors_script)), blink::BackForwardCacheAware::kAllow); } } @@ -874,7 +874,7 @@ void CosmeticFiltersJSHandler::OnHiddenClassIdSelectors( web_frame->ExecuteScriptInIsolatedWorld( isolated_world_id_, blink::WebScriptSource( - blink::WebString::FromUTF8(new_selectors_script)), + blink::WebString::FromUtf8(new_selectors_script)), blink::BackForwardCacheAware::kAllow); } @@ -899,7 +899,7 @@ void CosmeticFiltersJSHandler::ExecuteObservingBundleEntryPoint() { web_frame->ExecuteScriptInIsolatedWorld( isolated_world_id_, - blink::WebScriptSource(blink::WebString::FromUTF8(*s_observing_script)), + blink::WebScriptSource(blink::WebString::FromUtf8(*s_observing_script)), blink::BackForwardCacheAware::kAllow); // kObservingScriptletEntryPoint was called by `s_observing_script`. @@ -909,7 +909,7 @@ void CosmeticFiltersJSHandler::ExecuteObservingBundleEntryPoint() { web_frame->ExecuteScriptInIsolatedWorld( isolated_world_id_, blink::WebScriptSource( - blink::WebString::FromUTF8(kObservingScriptletEntryPoint)), + blink::WebString::FromUtf8(kObservingScriptletEntryPoint)), blink::BackForwardCacheAware::kAllow); } diff --git a/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc b/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc index 0640f2a9021..1761220bf76 100644 --- a/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc +++ b/components/cosmetic_filters/renderer/cosmetic_filters_js_render_frame_observer.cc @@ -45,7 +45,7 @@ void EnsureIsolatedWorldInitialized(int world_id) { info.security_origin = blink::WebSecurityOrigin::Create(GURL(kSecurityOrigin)); info.content_security_policy = - blink::WebString::FromUTF8(kContentSecurityPolicy); + blink::WebString::FromUtf8(kContentSecurityPolicy); blink::SetIsolatedWorldInfo(world_id, info); } diff --git a/components/safe_builtins/renderer/safe_builtins_helpers.cc b/components/safe_builtins/renderer/safe_builtins_helpers.cc index 566063039cd..188ea2fb033 100644 --- a/components/safe_builtins/renderer/safe_builtins_helpers.cc +++ b/components/safe_builtins/renderer/safe_builtins_helpers.cc @@ -81,7 +81,7 @@ v8::Local RunScript(v8::Local context, blink::WebConsoleMessage::LogWebConsoleMessage( context, blink::WebConsoleMessage( blink::mojom::ConsoleMessageLevel::kError, - blink::WebString::FromUTF8( + blink::WebString::FromUtf8( CreateExceptionString(context, try_catch)))); return v8::Undefined(v8::Isolate::GetCurrent()); } @@ -91,7 +91,7 @@ v8::Local RunScript(v8::Local context, blink::WebConsoleMessage::LogWebConsoleMessage( context, blink::WebConsoleMessage( blink::mojom::ConsoleMessageLevel::kError, - blink::WebString::FromUTF8( + blink::WebString::FromUtf8( CreateExceptionString(context, try_catch)))); return v8::Undefined(v8::Isolate::GetCurrent()); } @@ -132,7 +132,7 @@ v8::MaybeLocal LoadScriptWithSafeBuiltins( if (func_as_value.IsEmpty() || func_as_value->IsUndefined()) { web_frame->AddMessageToConsole( blink::WebConsoleMessage(blink::mojom::ConsoleMessageLevel::kError, - blink::WebString::FromUTF8("Bad source"))); + blink::WebString::FromUtf8("Bad source"))); return v8::MaybeLocal(); } diff --git a/components/web_discovery/renderer/blink_document_extractor.cc b/components/web_discovery/renderer/blink_document_extractor.cc index a8b8b066137..38a4aa7ed45 100644 --- a/components/web_discovery/renderer/blink_document_extractor.cc +++ b/components/web_discovery/renderer/blink_document_extractor.cc @@ -33,7 +33,7 @@ void ProcessAttributeRequests( for (const auto& request : requests) { if (request->sub_selector) { auto web_sub_selector = - blink::WebString::FromUTF8(*request->sub_selector); + blink::WebString::FromUtf8(*request->sub_selector); sub_element = element.QuerySelector(web_sub_selector); element_to_query = &*sub_element; } @@ -42,7 +42,7 @@ void ProcessAttributeRequests( if (request->attribute == kTextContentAttributeName) { attribute_value = element_to_query->TextContent().Utf8(); } else { - auto attribute_name = blink::WebString::FromUTF8(request->attribute); + auto attribute_name = blink::WebString::FromUtf8(request->attribute); auto web_attribute_value = element_to_query->GetAttribute(attribute_name); if (!web_attribute_value.IsNull()) { @@ -78,7 +78,7 @@ void BlinkDocumentExtractor::QueryElementAttributes( blink::WebDocument document = render_frame_->GetWebFrame()->GetDocument(); std::vector results; for (const auto& request : requests) { - auto selector = blink::WebString::FromUTF8(request->root_selector); + auto selector = blink::WebString::FromUtf8(request->root_selector); auto elements = document.QuerySelectorAll(selector); ProcessAttributeRequests(request->root_selector, request->attribute_requests, elements, results);