Add command line flag --disable-webrtc-encryption for dev and canary channels

chrome/browser/chrome_content_browser_client.cc

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..689d4d793595b4758e8d402f14d806431799226f 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,17 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
           chromeos::switches::kLoginProfile, login_profile);
 #endif
 
+#if defined(ENABLE_WEBRTC)
+    if (VersionInfo::GetChannel() <= VersionInfo::CHANNEL_DEV) {
+      static const char* const kWebRtcDevSwitchNames[] = {
+        switches::kDisableWebRtcEncryption,
+      };
+      command_line->CopySwitchesFrom(browser_command_line,

[sky, 2013/10/28 14:10:22]

Can you simplify to AppendSwitch?

[Henrik Grunell, 2013/10/28 15:06:57]

Yes after checking with browser_command_line->HasSwitch(). However that won't
transfer a possible value and although the code checking for this flag currently
doesn't bother about the value I think I would prefer being fully transparent.
Wdyt?

[sky, 2013/10/28 19:49:15]

You're right, this is fine.

+                                     kWebRtcDevSwitchNames,
+                                     arraysize(kWebRtcDevSwitchNames));
+    }
+#endif
+
     content::RenderProcessHost* process =
         content::RenderProcessHost::FromID(child_process_id);
     if (process) {