(merge m59) Added switch for bypassing protected media identifier permission

chrome/browser/ui/startup/bad_flags_prompt.cc

Index: chrome/browser/ui/startup/bad_flags_prompt.cc
diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
index 52eca334d8b96ac663fc7e0fefd47ec98e4a4a3f..af36969fbf47ed5d7f9ecc4fc2ffc177c889e2f7 100644
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -27,6 +27,7 @@
 #include "content/public/common/content_switches.h"
 #include "extensions/common/switches.h"
 #include "google_apis/gaia/gaia_switches.h"
+#include "media/base/media_switches.h"
 #include "media/media_features.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -90,6 +91,10 @@ void ShowBadFlagsPrompt(Browser* browser) {
     // getting the user's permission.
     switches::kUseFakeUIForMediaStream,
 
+    // This flag allows sites to access protected media identifiers without
+    // getting the user's permission.
+    switches::kUnsafelyAllowProtectedMediaIdentifierForDomain,
+
     NULL
   };