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"
+#include "net/base/url_util.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)

[raymes, 2017/04/19 01:24:19]

nit: these should have no identation

+  const bool isLocal = net::IsLocalHost(requesting_origin.host()) &&
+                       net::IsLoaclHost(embedding_origin.host());

[raymes, 2017/04/19 01:24:19]

nit: localhost is misspelt.

+
+  // 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);

[raymes, 2017/04/17 22:10:11]

Could you elaborate on what kind of test is this needed for? We've avoided
adding this kind of thing up until now for permissions.

[Joey Parrish, 2017/04/17 22:49:37]

This is for automated testing of protected content in Widevine's test lab.  The
current solution (accept the prompt the first time you run tests on the device)
does not work for us because our tests are not run on a fixed port.

We've discussed this with Xiaohan Wang, who is expecting a CL along these lines
eventually.  We weren't quite ready to ask for his review yet.  :-)

Happy to discuss in more detail if you would like.

[raymes, 2017/04/19 01:24:19]

Thanks for explaining. I think this is ok because there isn't really a more
satisfying general mechanism right now. We do expose some settings to extensions
to modify but we don't do that for protected media right now and I'm wary of
adding new things there.

Please add a test for this flag.

+
+  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