Commit ad116eaf authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Switch Platform::WebRtcStunProbeTrialParameter() away from std::string

... to use WebString instead.

BUG=78725
R=haraken@chromium.org

Change-Id: I7328edc399980f5b1105d07657c463cb1ac3f1d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1988291
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728533}
parent 42771db3
......@@ -568,14 +568,14 @@ bool RendererBlinkPlatformImpl::IsWebRtcStunOriginEnabled() {
switches::kEnableWebRtcStunOrigin);
}
base::Optional<std::string>
base::Optional<blink::WebString>
RendererBlinkPlatformImpl::WebRtcStunProbeTrialParameter() {
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (!cmd_line->HasSwitch(switches::kWebRtcStunProbeTrialParameter))
return base::nullopt;
return cmd_line->GetSwitchValueASCII(
switches::kWebRtcStunProbeTrialParameter);
return blink::WebString::FromASCII(
cmd_line->GetSwitchValueASCII(switches::kWebRtcStunProbeTrialParameter));
}
media::MediaPermission* RendererBlinkPlatformImpl::GetWebRTCMediaPermission(
......
......@@ -137,7 +137,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
bool UsesFakeCodecForPeerConnection() override;
bool IsWebRtcEncryptionEnabled() override;
bool IsWebRtcStunOriginEnabled() override;
base::Optional<std::string> WebRtcStunProbeTrialParameter() override;
base::Optional<blink::WebString> WebRtcStunProbeTrialParameter() override;
media::MediaPermission* GetWebRTCMediaPermission(
blink::WebLocalFrame* web_frame) override;
void GetWebRTCRendererPreferences(blink::WebLocalFrame* web_frame,
......
......@@ -578,7 +578,7 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual bool IsWebRtcSrtpEncryptedHeadersEnabled() { return false; }
virtual base::Optional<std::string> WebRtcStunProbeTrialParameter() {
virtual base::Optional<WebString> WebRtcStunProbeTrialParameter() {
return base::nullopt;
}
......
......@@ -541,8 +541,8 @@ void PeerConnectionDependencyFactory::InitializeWorkerThread(
}
void PeerConnectionDependencyFactory::TryScheduleStunProbeTrial() {
base::Optional<std::string> params =
blink::Platform::Current()->WebRtcStunProbeTrialParameter();
base::Optional<WebString> params =
Platform::Current()->WebRtcStunProbeTrialParameter();
if (!params)
return;
......@@ -552,7 +552,7 @@ void PeerConnectionDependencyFactory::TryScheduleStunProbeTrial() {
*chrome_worker_thread_.task_runner().get(), FROM_HERE,
CrossThreadBindOnce(
&PeerConnectionDependencyFactory::StartStunProbeTrialOnWorkerThread,
CrossThreadUnretained(this), String::FromUTF8(*params)),
CrossThreadUnretained(this), String(*params)),
base::TimeDelta::FromMilliseconds(blink::kExperimentStartDelayMs));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment