Rename GetSettingsOnBlockingPool().

Change it to GetSettingsOnBlockingTaskRunner(), to better reflect the
fact that the blocking pool no longer exists. Also rename
GetPrinterCapabilitiesOnBlockingPoolThread() for the same reason.

Change-Id: I4014eecc30611e94f31429477de56c54f90b3377
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1900769Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713245}

chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc

@@ -84,7 +84,7 @@ void FetchCapabilities(const chromeos::Printer& printer,
   base::PostTaskAndReplyWithResult(
       FROM_HERE,
       {base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_VISIBLE},
-      base::BindOnce(&GetSettingsOnBlockingPool, printer.id(), basic_info,
+      base::BindOnce(&GetSettingsOnBlockingTaskRunner, printer.id(), basic_info,
                      PrinterSemanticCapsAndDefaults::Papers(),
                      has_secure_protocol, nullptr),
       base::BindOnce(&CapabilitiesFetched, std::move(policies), std::move(cb)));

chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc

@@ -76,9 +76,9 @@ base::Value FetchCapabilitiesAsync(const std::string& device_name) {
     return base::Value();
   }
 
-  return GetSettingsOnBlockingPool(device_name, basic_info, additional_papers,
-                                   /* has_secure_protocol */ false,
-                                   print_backend);
+  return GetSettingsOnBlockingTaskRunner(
+      device_name, basic_info, additional_papers,
+      /* has_secure_protocol */ false, print_backend);
 }
 
 std::string GetDefaultPrinterAsync() {

components/printing/browser/printer_capabilities.cc

@@ -90,7 +90,7 @@ void PopulateAdvancedCapsLocalization(
 
 // Returns a dictionary representing printer capabilities as CDD.  Returns
 // an empty dictionary if a dictionary could not be generated.
-base::Value GetPrinterCapabilitiesOnBlockingPoolThread(
+base::Value GetPrinterCapabilitiesOnBlockingTaskRunner(
     const std::string& device_name,
     const PrinterSemanticCapsAndDefaults::Papers& additional_papers,
     bool has_secure_protocol,
@@ -151,7 +151,7 @@ std::string GetUserFriendlyName(const std::string& printer_name) {
 }
 #endif
 
-base::Value GetSettingsOnBlockingPool(
+base::Value GetSettingsOnBlockingTaskRunner(
     const std::string& device_name,
     const PrinterBasicInfo& basic_info,
     const PrinterSemanticCapsAndDefaults::Papers& additional_papers,
@@ -176,7 +176,7 @@ base::Value GetSettingsOnBlockingPool(
   printer_info_capabilities.SetKey(kPrinter, std::move(printer_info));
   printer_info_capabilities.SetKey(
       kSettingCapabilities,
-      GetPrinterCapabilitiesOnBlockingPoolThread(
+      GetPrinterCapabilitiesOnBlockingTaskRunner(
           device_name, additional_papers, has_secure_protocol, print_backend));
   return printer_info_capabilities;
 }

components/printing/browser/printer_capabilities.h

@@ -36,7 +36,7 @@ std::pair<std::string, std::string> GetPrinterNameAndDescription(
 // with default settings.
 // Data from |basic_info|, |additional_papers| and |has_secure_protocol| are
 // incorporated into the returned dictionary.
-base::Value GetSettingsOnBlockingPool(
+base::Value GetSettingsOnBlockingTaskRunner(
     const std::string& device_name,
     const PrinterBasicInfo& basic_info,
     const PrinterSemanticCapsAndDefaults::Papers& additional_papers,

components/printing/browser/printer_capabilities_unittest.cc

@@ -52,9 +52,9 @@ TEST_F(PrinterCapabilitiesTest, NonNullForMissingPrinter) {
   PrinterBasicInfo basic_info;
   PrinterSemanticCapsAndDefaults::Papers no_additional_papers;
 
-  base::Value settings_dictionary =
-      GetSettingsOnBlockingPool(printer_name, basic_info, no_additional_papers,
-                                /* has_secure_protocol */ false, nullptr);
+  base::Value settings_dictionary = GetSettingsOnBlockingTaskRunner(
+      printer_name, basic_info, no_additional_papers,
+      /* has_secure_protocol */ false, nullptr);
 
   ASSERT_FALSE(settings_dictionary.DictEmpty());
 }
@@ -69,7 +69,7 @@ TEST_F(PrinterCapabilitiesTest, ProvidedCapabilitiesUsed) {
   caps->dpis = {{600, 600}};
   print_backend()->AddValidPrinter(printer_name, std::move(caps));
 
-  base::Value settings_dictionary = GetSettingsOnBlockingPool(
+  base::Value settings_dictionary = GetSettingsOnBlockingTaskRunner(
       printer_name, basic_info, no_additional_papers,
       /* has_secure_protocol */ false, print_backend());
 
@@ -99,7 +99,7 @@ TEST_F(PrinterCapabilitiesTest, NullCapabilitiesExcluded) {
   // Return false when attempting to retrieve capabilities.
   print_backend()->AddValidPrinter(printer_name, nullptr);
 
-  base::Value settings_dictionary = GetSettingsOnBlockingPool(
+  base::Value settings_dictionary = GetSettingsOnBlockingTaskRunner(
       printer_name, basic_info, no_additional_papers,
       /* has_secure_protocol */ false, print_backend());
 
@@ -127,7 +127,7 @@ TEST_F(PrinterCapabilitiesTest, AdditionalPapers) {
   additional_papers.push_back({"foo", "vendor", {200, 300}});
   additional_papers.push_back({"bar", "vendor", {600, 600}});
 
-  base::Value settings_dictionary = GetSettingsOnBlockingPool(
+  base::Value settings_dictionary = GetSettingsOnBlockingTaskRunner(
       printer_name, basic_info, additional_papers,
       /* has_secure_protocol */ false, print_backend());
 
@@ -198,9 +198,9 @@ TEST_F(PrinterCapabilitiesTest, HasNotSecureProtocol) {
   caps->pin_supported = true;
   print_backend()->AddValidPrinter(printer_name, std::move(caps));
 
-  base::Value settings_dictionary =
-      GetSettingsOnBlockingPool(printer_name, basic_info, no_additional_papers,
-                                has_secure_protocol, print_backend());
+  base::Value settings_dictionary = GetSettingsOnBlockingTaskRunner(
+      printer_name, basic_info, no_additional_papers, has_secure_protocol,
+      print_backend());
 
   // Verify settings were created.
   ASSERT_FALSE(settings_dictionary.DictEmpty());

printing/backend/cups_ipp_util_unittest.cc

@@ -187,7 +187,7 @@ TEST_F(PrintBackendCupsIppUtilTest, A4PaperSupported) {
 
   PrinterSemanticCapsAndDefaults::Paper paper = caps.papers[0];
   // media display name localization is handled more fully in
-  // GetPrinterCapabilitiesOnBlockingPoolThread().
+  // GetPrinterCapabilitiesOnBlockingTaskRunner().
   EXPECT_EQ("iso a4", paper.display_name);
   EXPECT_EQ("iso_a4_210x297mm", paper.vendor_id);
   EXPECT_EQ(210000, paper.size_um.width());
@@ -200,7 +200,7 @@ TEST_F(PrintBackendCupsIppUtilTest, LegalPaperDefault) {
   PrinterSemanticCapsAndDefaults caps;
   CapsAndDefaultsFromPrinter(*printer_, &caps);
   // media display name localization is handled more fully in
-  // GetPrinterCapabilitiesOnBlockingPoolThread().
+  // GetPrinterCapabilitiesOnBlockingTaskRunner().
   EXPECT_EQ("na legal", caps.default_paper.display_name);
   EXPECT_EQ("na_legal_8.5x14in", caps.default_paper.vendor_id);
   EXPECT_EQ(215900, caps.default_paper.size_um.width());