(merge m59) Added switch for bypassing protected media identifier permission

chrome/browser/media/protected_media_identifier_permission_context.h

Index: chrome/browser/media/protected_media_identifier_permission_context.h
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.h b/chrome/browser/media/protected_media_identifier_permission_context.h
index 8bb0c68df43678015c8d0321a728599ce85bfad4..f4bd7890a20a819ab91c95fd7789f717e9be8226 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.h
+++ b/chrome/browser/media/protected_media_identifier_permission_context.h
@@ -53,6 +53,9 @@ class ProtectedMediaIdentifierPermissionContext
                                const PermissionRequestID& id) override;
 
  private:
+  friend class ProtectedMediaIdentifierPermissionContextTest;
+  static bool IsOriginWhitelisted(const GURL& origin);
+
   void UpdateTabContext(const PermissionRequestID& id,
                         const GURL& requesting_frame,
                         bool allowed) override;