Remove some obsolete TODOs related to ExtensionPrinterHandler.

Simplify some code too.

Change-Id: I94dbf05f1090ee7d3ecd88e8e6ef7edd778494c2
Reviewed-on: https://chromium-review.googlesource.com/1043361Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556104}

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

@@ -97,6 +97,11 @@ bool ParseProvisionalUsbPrinterId(const std::string& printer_id,
   return true;
 }
 
+extensions::PrinterProviderAPI* GetPrinterProviderAPI(Profile* profile) {
+  return extensions::PrinterProviderAPIFactory::GetInstance()
+      ->GetForBrowserContext(profile);
+}
+
 }  // namespace
 
 ExtensionPrinterHandler::ExtensionPrinterHandler(Profile* profile)
@@ -138,22 +143,18 @@ void ExtensionPrinterHandler::StartGetPrinters(
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
-  extensions::PrinterProviderAPIFactory::GetInstance()
-      ->GetForBrowserContext(profile_)
-      ->DispatchGetPrintersRequested(
-          base::Bind(&ExtensionPrinterHandler::WrapGetPrintersCallback,
-                     weak_ptr_factory_.GetWeakPtr(), callback));
+  GetPrinterProviderAPI(profile_)->DispatchGetPrintersRequested(
+      base::BindRepeating(&ExtensionPrinterHandler::WrapGetPrintersCallback,
+                          weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void ExtensionPrinterHandler::StartGetCapability(
     const std::string& destination_id,
     GetCapabilityCallback callback) {
-  extensions::PrinterProviderAPIFactory::GetInstance()
-      ->GetForBrowserContext(profile_)
-      ->DispatchGetCapabilityRequested(
-          destination_id,
-          base::BindOnce(&ExtensionPrinterHandler::WrapGetCapabilityCallback,
-                         weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
+  GetPrinterProviderAPI(profile_)->DispatchGetCapabilityRequested(
+      destination_id,
+      base::BindOnce(&ExtensionPrinterHandler::WrapGetCapabilityCallback,
+                     weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
 }
 
 void ExtensionPrinterHandler::StartPrint(
@@ -175,12 +176,9 @@ void ExtensionPrinterHandler::StartPrint(
   cloud_devices::printer::ContentTypesCapability content_types;
   content_types.LoadFrom(printer_description);
 
-  const bool kUsePdf = content_types.Contains(kContentTypePdf) ||
+  const bool use_pdf = content_types.Contains(kContentTypePdf) ||
                        content_types.Contains(kContentTypeAll);
-
-  if (kUsePdf) {
-    // TODO(tbarzic): Consider writing larger PDF to disk and provide the data
-    // the same way as it's done with PWG raster.
+  if (use_pdf) {
     print_job->content_type = kContentTypePdf;
     print_job->document_bytes = print_data;
     DispatchPrintJob(std::move(callback), std::move(print_job));
@@ -222,12 +220,10 @@ void ExtensionPrinterHandler::StartGrantPrinterAccess(
       DevicePermissionsManager::Get(profile_);
   permissions_manager->AllowUsbDevice(extension_id, device);
 
-  extensions::PrinterProviderAPIFactory::GetInstance()
-      ->GetForBrowserContext(profile_)
-      ->DispatchGetUsbPrinterInfoRequested(
-          extension_id, device,
-          base::BindOnce(&ExtensionPrinterHandler::WrapGetPrinterInfoCallback,
-                         weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
+  GetPrinterProviderAPI(profile_)->DispatchGetUsbPrinterInfoRequested(
+      extension_id, device,
+      base::BindOnce(&ExtensionPrinterHandler::WrapGetPrinterInfoCallback,
+                     weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
 }
 
 void ExtensionPrinterHandler::SetPwgRasterConverterForTesting(

chrome/browser/ui/webui/print_preview/extension_printer_handler.h

@@ -56,7 +56,6 @@ class ExtensionPrinterHandler : public PrinterHandler {
                         GetPrintersDoneCallback done_callback) override;
   void StartGetCapability(const std::string& destination_id,
                           GetCapabilityCallback callback) override;
-  // TODO(tbarzic): It might make sense to have the strings in a single struct.
   void StartPrint(const std::string& destination_id,
                   const std::string& capability,
                   const base::string16& job_title,

chrome/browser/ui/webui/print_preview/printer_handler.h

@@ -120,7 +120,6 @@ class PrinterHandler {
   // |page_size|: The document page size.
   // |print_data|: The document bytes to print.
   // |callback| should be called in the response to the request.
-  // TODO(tbarzic): Page size should be extracted from print data.
   virtual void StartPrint(
       const std::string& destination_id,
       const std::string& capability,