From 9ed49f8231773eae1665162fee8909d284c918e7 Mon Sep 17 00:00:00 2001 From: "grunell@chromium.org" Date: Fri, 7 Feb 2014 17:45:59 +0000 Subject: [PATCH] Allow disable WebRTC encryption in Chrome beta channel on Android. BUG=336743 Review URL: https://codereview.chromium.org/151303003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249718 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chrome_content_browser_client.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 31b4d33528d0..cf19a3aeea08 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -1482,7 +1482,14 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( #endif #if defined(ENABLE_WEBRTC) - if (VersionInfo::GetChannel() <= VersionInfo::CHANNEL_DEV) { +#if defined(OS_ANDROID) + const VersionInfo::Channel kMaxDisableEncryptionChannel = + VersionInfo::CHANNEL_BETA; +#else + const VersionInfo::Channel kMaxDisableEncryptionChannel = + VersionInfo::CHANNEL_DEV; +#endif + if (VersionInfo::GetChannel() <= kMaxDisableEncryptionChannel) { static const char* const kWebRtcDevSwitchNames[] = { switches::kDisableWebRtcEncryption, }; -- 2.11.4.GIT