Commit 7eabddd8 authored by Ian Kilpatrick's avatar Ian Kilpatrick Committed by Commit Bot

[code-inclusion] Remove "whitelisted" from usb_device.cc

As above - there should be no behaviour change.

Bug: 842296
Change-Id: If04aee8a0bf9c0decf9a829e86ed7e440c618f96
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2261428
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Auto-Submit: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781614}
parent 36109857
...@@ -56,8 +56,8 @@ const char kOpenRequired[] = "The device must be opened first."; ...@@ -56,8 +56,8 @@ const char kOpenRequired[] = "The device must be opened first.";
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
const char kExtensionProtocol[] = "chrome-extension"; const char kExtensionProtocol[] = "chrome-extension";
// These whitelisted Imprivata extensions can claim the protected HID interface // These Imprivata extensions can claim the protected HID interface class (used
// class (used as badge readers), see crbug.com/1065112 and crbug.com/995294. // as badge readers), see crbug.com/1065112 and crbug.com/995294.
// This list needs to be alphabetically sorted for quick access via binary // This list needs to be alphabetically sorted for quick access via binary
// search. // search.
const char* kImprivataExtensionIds[] = { const char* kImprivataExtensionIds[] = {
...@@ -80,7 +80,7 @@ bool IsCStrBefore(const char* first, const char* second) { ...@@ -80,7 +80,7 @@ bool IsCStrBefore(const char* first, const char* second) {
return strcmp(first, second) < 0; return strcmp(first, second) < 0;
} }
bool IsClassWhitelistedForExtension(uint8_t class_code, const KURL& url) { bool IsClassAllowedForExtension(uint8_t class_code, const KURL& url) {
if (url.Protocol() != kExtensionProtocol) if (url.Protocol() != kExtensionProtocol)
return false; return false;
...@@ -670,8 +670,8 @@ bool USBDevice::IsProtectedInterfaceClass(wtf_size_t interface_index) const { ...@@ -670,8 +670,8 @@ bool USBDevice::IsProtectedInterfaceClass(wtf_size_t interface_index) const {
std::end(kProtectedClasses), std::end(kProtectedClasses),
alternate->class_code)) { alternate->class_code)) {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
return !IsClassWhitelistedForExtension(alternate->class_code, return !IsClassAllowedForExtension(alternate->class_code,
GetExecutionContext()->Url()); GetExecutionContext()->Url());
#else #else
return true; return true;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment