bluetooth: web: Rename Blacklist to Blocklist

chrome/browser/web_bluetooth_browsertest.cc

 // Copyright 2016 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.
 
 // This file contains browsertests for Web Bluetooth that depend on behavior
 // defined in chrome/, not just in content/.
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/permissions/permission_context_base.h"
@@ skipping 108 matching lines @@
       "navigator.bluetooth.requestDevice({filters: [{name: 'Hello'}]})"
       "  .then(() => { domAutomationController.send('Success'); },"
       "        reason => {"
       "      domAutomationController.send(reason.name + ': ' + reason.message);"
       "  });",
       &rejection));
   EXPECT_THAT(rejection,
               testing::MatchesRegex("NotFoundError: .*globally disabled.*"));
 }
 
-// Tests that using Finch field trial parameters for blacklist additions has
+// Tests that using Finch field trial parameters for blocklist additions has
 // the effect of rejecting requestDevice calls.
-IN_PROC_BROWSER_TEST_F(WebBluetoothTest, BlacklistShouldBlock) {
+IN_PROC_BROWSER_TEST_F(WebBluetoothTest, BlocklistShouldBlock) {
   // Fake the BluetoothAdapter to say it's present.
   scoped_refptr<device::MockBluetoothAdapter> adapter =
       new testing::NiceMock<device::MockBluetoothAdapter>;
   EXPECT_CALL(*adapter, IsPresent()).WillRepeatedly(Return(true));
   device::BluetoothAdapterFactory::SetAdapterForTesting(adapter);
 
-  if (base::FieldTrialList::TrialExists("WebBluetoothBlacklist")) {
-    LOG(INFO) << "WebBluetoothBlacklist field trial already configured.";
-    ASSERT_NE(variations::GetVariationParamValue("WebBluetoothBlacklist",
-                                                 "blacklist_additions")
+  if (base::FieldTrialList::TrialExists("WebBluetoothBlocklist")) {
+    LOG(INFO) << "WebBluetoothBlocklist field trial already configured.";
+    ASSERT_NE(variations::GetVariationParamValue("WebBluetoothBlocklist",
+                                                 "blocklist_additions")
                   .find("ed5f25a4"),
               std::string::npos)
-        << "ERROR: WebBluetoothBlacklist field trial being tested in\n"
+        << "ERROR: WebBluetoothBlocklist field trial being tested in\n"
            "testing/variations/fieldtrial_testing_config_*.json must\n"
            "include this test's random UUID 'ed5f25a4' in\n"
-           "blacklist_additions.\n";
+           "blocklist_additions.\n";
   } else {
-    LOG(INFO) << "Creating WebBluetoothBlacklist field trial for test.";
+    LOG(INFO) << "Creating WebBluetoothBlocklist field trial for test.";
     // Create a field trial with test parameter.
     std::map<std::string, std::string> params;
-    params["blacklist_additions"] = "ed5f25a4:e";
-    variations::AssociateVariationParams("WebBluetoothBlacklist", "TestGroup",
+    params["blocklist_additions"] = "ed5f25a4:e";
+    variations::AssociateVariationParams("WebBluetoothBlocklist", "TestGroup",
                                          params);
-    base::FieldTrialList::CreateFieldTrial("WebBluetoothBlacklist",
+    base::FieldTrialList::CreateFieldTrial("WebBluetoothBlocklist",
                                            "TestGroup");
   }
 
   std::string rejection;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       web_contents_,
       "navigator.bluetooth.requestDevice({filters: [{services: [0xed5f25a4]}]})"
       "  .then(() => { domAutomationController.send('Success'); },"
       "        reason => {"
       "      domAutomationController.send(reason.name + ': ' + reason.message);"
       "  });",
       &rejection));
   EXPECT_THAT(rejection,
-              testing::MatchesRegex("SecurityError: .*blacklisted UUID.*"));
+              testing::MatchesRegex("SecurityError: .*blocklisted UUID.*"));
 }
 
 }  // namespace