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..bd8b56be23e63b25f8090717767399ee42ffa824 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -6,6 +6,7 @@
 
 #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/permissions/permission_util.h"
@@ -15,6 +16,8 @@
 #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 +104,37 @@ ProtectedMediaIdentifierPermissionContext::GetPermissionStatusInternal(
          content_setting == CONTENT_SETTING_BLOCK ||
          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.
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  if (content_setting == CONTENT_SETTING_ASK &&
+      command_line.HasSwitch(
+          switches::kDisableInfobarForProtectedMediaIdentifierForDomain)) {
+    // Convert the switch value to a vector or URLs

[Joey Parrish, 2017/04/19 17:15:52]

typo: vector _of_ URLs

[Vaage, 2017/04/19 17:26:22]

Done.

+    std::vector<std::string> origins;
+    std::string whitelist = command_line.GetSwitchValueASCII(
+        switches::kDisableInfobarForProtectedMediaIdentifierForDomain);
+    for (const std::string& origin : base::SplitString(
+             whitelist, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
+      origins.push_back(origin);
+    }
+
+    // Only if both requesting and embedding are allowed, allow the prompt to
+    // be skipped.
+    bool found_requesting = false;
+    bool found_embedding = false;
+    for (size_t i = 0; i < origins.size(); i++) {
+      found_requesting |= origins.at(i) == requesting_origin.host();
+      found_embedding |= origins.at(i) == embedding_origin.host();

[Joey Parrish, 2017/04/19 17:15:53]

Have you confirmed that host() includes the port?

[Vaage, 2017/04/19 17:26:22]

If I am correct, host() does not include information about the port. Do we want
to limit the port in addition to the domain?

[Joey Parrish, 2017/04/19 17:51:17]

Good question.  I thought so, but let's discuss offline and compare to similar
flags that already exist.

+    }
+
+    if (found_requesting && found_embedding) {
+      content_setting = CONTENT_SETTING_ALLOW;
+    }
+  }
+
   return content_setting;
 }