Added switch for bypassing protected media identifier permission

chrome/browser/media/protected_media_identifier_whitelist.cc

+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/media/protected_media_identifier_whitelist.h"
+
+#include "base/command_line.h"
+#include "base/strings/string_split.h"
+#include "chrome/common/chrome_switches.h"
+#include "media/base/media_switches.h"
+
+ProtectedMediaIdentifierWhitelist::ProtectedMediaIdentifierWhitelist() {}
+
+ProtectedMediaIdentifierWhitelist::~ProtectedMediaIdentifierWhitelist() {}
+
+bool ProtectedMediaIdentifierWhitelist::IsOriginWhitelisted(
+    const GURL& requesting_origin) const {
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+
+  const std::string userDataDir =
+      command_line.HasSwitch(switches::kUserDataDir)
+          ? command_line.GetSwitchValueASCII(switches::kUserDataDir)

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

GetSwitchValueASCII() returns empty string when the flag is not present, so you
don't need to check both.

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

Done.

+          : "";
+
+  const std::string whitelist =
+      command_line.HasSwitch(
+          switches::kDisableInfobarForProtectedMediaIdentifierForDomain)
+          ? command_line.GetSwitchValueASCII(
+                switches::kDisableInfobarForProtectedMediaIdentifierForDomain)
+          : "";
+
+  bool found = false;
+
+  if (userDataDir != "" && whitelist != "") {
+    for (const std::string& origin :
+         base::SplitString(whitelist, ",", base::TRIM_WHITESPACE,
+                           base::SPLIT_WANT_NONEMPTY)) {
+      found = found || requesting_origin.DomainIs(origin);
+    }
+  }
+
+  return found;
+}

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

In Chromium, we like to return early so that readers don't need to remember a
lot of local variables/state. I made some modifications on your code and it
looks like below. How do you like it?

bool ProtectedMediaIdentifierWhitelist::IsOriginWhitelisted(
    const GURL& requesting_origin) const {
  const base::CommandLine& command_line =
      *base::CommandLine::ForCurrentProcess();

  if (command_line.GetSwitchValueASCII(switches::kUserDataDir).empty())
    return false;

  const std::string whitelist = command_line.GetSwitchValueASCII(
      switches::kDisableInfobarForProtectedMediaIdentifierForDomain);
  for (const std::string& origin : base::SplitString(
           whitelist, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
    if (requesting_origin.DomainIs(origin)) return true;
  }

  return false;
}