Added switch for bypassing protected media identifier permission

chrome/browser/media/protected_media_identifier_permission_context.cc

Index: chrome/browser/media/protected_media_identifier_permission_context.cc
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc
index 50c2dc51ec53a1f4269eff81c038c44fc6eb40bc..1ab6868f80ff60b8c2f51f52c8fb27c74a67872d 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -6,15 +6,20 @@
 
 #include "base/command_line.h"
 #include "base/metrics/user_metrics.h"
+#include "base/strings/string_split.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
+#include "chrome/browser/media/protected_media_identifier_whitelist.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "media/base/media_switches.h"
+#include "net/base/url_util.h"
 #if defined(OS_CHROMEOS)
 #include <utility>
 
@@ -101,6 +106,16 @@ ProtectedMediaIdentifierPermissionContext::GetPermissionStatusInternal(
          content_setting == CONTENT_SETTING_BLOCK ||
          content_setting == CONTENT_SETTING_ASK);
 
+  if (content_setting == CONTENT_SETTING_ASK) {
+    // For automated testing of protected content - having a prompt that
+    // requires user intervention is problematic. If the domain has been
+    // whitelisted as safe - suppress the request and allow.
+    ProtectedMediaIdentifierWhitelist whitelist;
+    content_setting = whitelist.IsOriginWhitelisted(requesting_origin)
+                          ? CONTENT_SETTING_ALLOW
+                          : CONTENT_SETTING_ASK;
+  }

[xhwang, 2017/05/04 22:10:59]

If you make IsOriginWhitelisted() as a static function (see below), this block
can be further simplified to:

  // For automated testing of protected content - having a prompt that
  // requires user intervention is problematic. If the domain has been
  // whitelisted as safe - suppress the request and allow.
  if (content_setting == CONTENT_SETTING_ASK &&
      IsOriginWhitelisted(requesting_origin)) {
    content_setting = CONTENT_SETTING_ALLOW;
  }

[Vaage, 2017/05/05 16:10:03]

Done.

+
   return content_setting;
 }