Added switch for bypassing protected media identifier permission

chrome/browser/media/protected_media_identifier_permission_context.cc

 // Copyright 2013 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_permission_context.h"
 
 #include "base/command_line.h"
 #include "base/metrics/user_metrics.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.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"
-#if defined(OS_CHROMEOS)
+#if defined(OS_ANDROID)
+#include "media/base/media_switches.h"
+#elif defined(OS_CHROMEOS)
 #include <utility>
 
 #include "chrome/browser/chromeos/attestation/platform_verification_dialog.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/user_prefs/user_prefs.h"
 #include "ui/views/widget/widget.h"
-#elif !defined(OS_ANDROID)
+#else
 #error This file currently only supports Chrome OS and Android.
 #endif
 
 #if defined(OS_CHROMEOS)
 using chromeos::attestation::PlatformVerificationDialog;
 #endif
 
 ProtectedMediaIdentifierPermissionContext::
     ProtectedMediaIdentifierPermissionContext(Profile* profile)
     : PermissionContextBase(profile,
@@ skipping 55 matching lines @@
     return CONTENT_SETTING_BLOCK;
   }
 
   ContentSetting content_setting =
       PermissionContextBase::GetPermissionStatusInternal(
           render_frame_host, requesting_origin, embedding_origin);
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK ||
          content_setting == CONTENT_SETTING_ASK);
 
+  #if defined(OS_ANDROID)

[Joey Parrish, 2017/04/17 19:45:18]

I am of the opinion that this could be useful in other places than Android. 
ChromeOS, for example, may start prompting in similar scenarios in future, and
it would be helpful if we didn't have to patch Chromium again when that happens.

[Vaage, 2017/04/19 16:55:47]

Done.

+  const bool isLocal = requesting_origin.host() == "localhost" &&
+                       embedding_origin.host() == "localhost";

[Joey Parrish, 2017/04/17 19:45:18]

I found this, for context:
https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/WZsI_gFftmc

Based on that, I think checking both here is reasonable.

However, I think it would be better if host() did not have to be literally the
string "localhost".  "127.0.0.1", "localhost.localdomain", etc, should also be
allowed (ideally).

I hit cs.chromium.org and searched for "localhost" and "127.0.0.1", which led me
to this utility:

https://cs.chromium.org/chromium/src/net/base/url_util.cc?dr=CSs&l=350

[Vaage, 2017/04/19 16:55:47]

Done.

+
+  // For testing of protected content, always allow content from localhost
+  // if the switch has been set.
+  const bool allowLocalContent =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableInfobarForProtectedMediaIdentifierForLocalhost);
+
+  if (allowLocalContent && isLocal && content_setting == CONTENT_SETTING_ASK) {
+    content_setting = CONTENT_SETTING_ALLOW;
+  }
+  #endif
+
   return content_setting;
 }
 
 void ProtectedMediaIdentifierPermissionContext::CancelPermissionRequest(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
 #if defined(OS_CHROMEOS)
   PendingRequestMap::iterator request = pending_requests_.find(web_contents);
@@ skipping 110 matching lines @@
       content_setting = CONTENT_SETTING_BLOCK;
       persist = true;
       break;
   }
 
   NotifyPermissionSet(
       id, requesting_origin, embedding_origin, callback,
       persist, content_setting);
 }
 #endif