Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index e4347f8edd524a8b1ac01c4988b837de54b0225c..c3a9a9925322f3c8abd6708c81ce09074603a71c 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -93,6 +93,7 @@ |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
+#include "chrome/common/chrome_version_info.h" |
#include "chrome/common/env_vars.h" |
#include "chrome/common/extensions/background_info.h" |
#include "chrome/common/extensions/extension.h" |
@@ -1428,6 +1429,19 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( |
chromeos::switches::kLoginProfile, login_profile); |
#endif |
+#if defined(ENABLE_WEBRTC) |
+ VersionInfo::Channel channel = VersionInfo::GetChannel(); |
+ if (channel == VersionInfo::CHANNEL_DEV || |
+ channel == VersionInfo::CHANNEL_CANARY) { |
+ static const char* const kWebRtcDevSwitchNames[] = { |
+ switches::kDisableWebRtcEncryption, |
+ }; |
+ command_line->CopySwitchesFrom(browser_command_line, |
+ kWebRtcDevSwitchNames, |
+ arraysize(kWebRtcDevSwitchNames)); |
+ } |
+#endif |
+ |
content::RenderProcessHost* process = |
content::RenderProcessHost::FromID(child_process_id); |
if (process) { |