[Code Inclusion] Remove usages of "blacklist" in media/capture.

Replace with more inclusive terms per Chromium Style Guide.

Bug: 1106011
Change-Id: I6b88cb9bfa1e1b7fa004c6e40b2ea6712cd29083
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2335486Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: mark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794593}

media/capture/video/linux/v4l2_capture_delegate.cc

@@ -141,7 +141,7 @@ bool IsSpecialControl(int control_id) {
 #if !defined(V4L2_CID_PANTILT_CMD)
 #define V4L2_CID_PANTILT_CMD (V4L2_CID_CAMERA_CLASS_BASE + 34)
 #endif
-bool IsBlacklistedControl(int control_id) {
+bool IsBlockedControl(int control_id) {
   switch (control_id) {
     case V4L2_CID_PAN_RELATIVE:
     case V4L2_CID_TILT_RELATIVE:
@@ -730,7 +730,7 @@ void V4L2CaptureDelegate::ResetUserAndCameraControlsToDefault() {
 
       if (IsSpecialControl(range.id & ~V4L2_CTRL_FLAG_NEXT_CTRL))
         continue;
-      if (IsBlacklistedControl(range.id & ~V4L2_CTRL_FLAG_NEXT_CTRL))
+      if (IsBlockedControl(range.id & ~V4L2_CTRL_FLAG_NEXT_CTRL))
         continue;
 
       struct v4l2_ext_control ext_control = {};

media/capture/video/linux/v4l2_capture_delegate_unittest.cc

@@ -36,7 +36,7 @@ static struct {
                        {V4L2_CID_CAMERA_CLASS_BASE, V4L2_CID_CAMERA_CLASS}};
 
 // Determines if |control_id| is special, i.e. controls another one's state, or
-// if it should be skipped (blacklisted, https://crbug.com/697885).
+// if it should be denied (see https://crbug.com/697885).
 #if !defined(V4L2_CID_PAN_SPEED)
 #define V4L2_CID_PAN_SPEED (V4L2_CID_CAMERA_CLASS_BASE + 32)
 #endif
@@ -46,7 +46,7 @@ static struct {
 #if !defined(V4L2_CID_PANTILT_CMD)
 #define V4L2_CID_PANTILT_CMD (V4L2_CID_CAMERA_CLASS_BASE + 34)
 #endif
-static bool IsSpecialOrBlacklistedControl(int control_id) {
+static bool IsSpecialOrBlockedControl(int control_id) {
   switch (control_id) {
     case V4L2_CID_AUTO_WHITE_BALANCE:
     case V4L2_CID_EXPOSURE_AUTO:
@@ -111,7 +111,7 @@ static void SetControlsToMaxValues(int device_fd) {
         break;
       range.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
 
-      if (IsSpecialOrBlacklistedControl(range.id & ~V4L2_CTRL_FLAG_NEXT_CTRL))
+      if (IsSpecialOrBlockedControl(range.id & ~V4L2_CTRL_FLAG_NEXT_CTRL))
         continue;
       DVLOG(1) << __func__ << " " << range.name << " set to " << range.maximum;
 
@@ -136,7 +136,7 @@ static void SetControlsToMaxValues(int device_fd) {
         break;
       range.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
 
-      if (IsSpecialOrBlacklistedControl(range.id & ~V4L2_CTRL_FLAG_NEXT_CTRL))
+      if (IsSpecialOrBlockedControl(range.id & ~V4L2_CTRL_FLAG_NEXT_CTRL))
         continue;
       DVLOG(1) << __func__ << " " << range.name << " set to " << range.maximum;
 

media/capture/video/mac/video_capture_device_factory_mac.mm

@@ -34,9 +34,9 @@ void EnsureRunsOnCFRunLoopEnabledThread() {
   }
 }
 
-// Blacklisted devices are identified by a characteristic trailing substring of
+// Blocked devices are identified by a characteristic trailing substring of
 // uniqueId. At the moment these are just Blackmagic devices.
-const char* kBlacklistedCamerasIdSignature[] = {"-01FDA82C8A9C"};
+const char* kBlockedCamerasIdSignature[] = {"-01FDA82C8A9C"};
 
 int32_t get_device_descriptors_retry_count = 0;
 
@@ -44,20 +44,18 @@ int32_t get_device_descriptors_retry_count = 0;
 
 namespace media {
 
-static bool IsDeviceBlacklisted(
-    const VideoCaptureDeviceDescriptor& descriptor) {
-  bool is_device_blacklisted = false;
+static bool IsDeviceBlocked(const VideoCaptureDeviceDescriptor& descriptor) {
+  bool is_device_blocked = false;
   for (size_t i = 0;
-       !is_device_blacklisted && i < base::size(kBlacklistedCamerasIdSignature);
-       ++i) {
-    is_device_blacklisted =
-        base::EndsWith(descriptor.device_id, kBlacklistedCamerasIdSignature[i],
+       !is_device_blocked && i < base::size(kBlockedCamerasIdSignature); ++i) {
+    is_device_blocked =
+        base::EndsWith(descriptor.device_id, kBlockedCamerasIdSignature[i],
                        base::CompareCase::INSENSITIVE_ASCII);
   }
-  DVLOG_IF(2, is_device_blacklisted)
-      << "Blacklisted camera: " << descriptor.display_name()
+  DVLOG_IF(2, is_device_blocked)
+      << "Blocked camera: " << descriptor.display_name()
       << ", id: " << descriptor.device_id;
-  return is_device_blacklisted;
+  return is_device_blocked;
 }
 
 VideoCaptureDeviceFactoryMac::VideoCaptureDeviceFactoryMac() {
@@ -125,7 +123,7 @@ void VideoCaptureDeviceFactoryMac::GetDevicesInfo(
         [[[capture_devices valueForKey:key] deviceName] UTF8String], device_id,
         model_id, capture_api,
         /*pan_tilt_zoom_supported=*/false, device_transport_type);
-    if (IsDeviceBlacklisted(descriptor))
+    if (IsDeviceBlocked(descriptor))
       continue;
     devices_info.emplace_back(descriptor);
 

media/capture/video/win/video_capture_device_factory_win_unittest.cc

@@ -1287,8 +1287,8 @@ TEST_F(VideoCaptureDeviceFactoryMFWinTest, GetDevicesInfo) {
   EXPECT_FALSE(it->descriptor.pan_tilt_zoom_supported());
 
   // Devices that are listed in both MediaFoundation and DirectShow but are
-  // blacklisted for use with MediaFoundation are expected to get enumerated
-  // with VideoCaptureApi::WIN_DIRECT_SHOW.
+  // blocked for use with MediaFoundation are expected to get enumerated with
+  // VideoCaptureApi::WIN_DIRECT_SHOW.
   it = FindDeviceInRange(devices_info.begin(), devices_info.end(),
                          base::SysWideToUTF8(kDirectShowDeviceId6));
   ASSERT_NE(it, devices_info.end());