Modifying CupsPrinters users APIs

CupsPrinters is becoming a BCKS. This change modifies services using it
to create and store handles to it correctly.

BUG=chromium:829492
TEST=manually ensured behavior unchanged

Change-Id: Ibca680fd3b29314b38a72288ed28f6b0f2dca42e
Reviewed-on: https://chromium-review.googlesource.com/998612Reviewed-by: Yusuke Sato <yusukes@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Sean Kau <skau@chromium.org>
Commit-Queue: Luum Habtemariam <luum@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553663}

chrome/browser/chromeos/arc/print/arc_print_service.cc

@@ -19,6 +19,7 @@
 #include "chrome/browser/chromeos/printing/cups_print_job_manager.h"
 #include "chrome/browser/chromeos/printing/cups_print_job_manager_factory.h"
 #include "chrome/browser/chromeos/printing/cups_printers_manager.h"
+#include "chrome/browser/chromeos/printing/cups_printers_manager_factory.h"
 #include "chrome/browser/chromeos/printing/printer_configurer.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_job_worker.h"
@@ -194,7 +195,8 @@ class PrinterDiscoverySessionHostImpl
       : binding_(this, std::move(request)),
         instance_(std::move(instance)),
         service_(service),
-        printers_manager_(chromeos::CupsPrintersManager::Create(profile)),
+        printers_manager_(chromeos::CupsPrintersManagerFactory::GetInstance()
+                              ->GetForBrowserContext(profile)),
         configurer_(chromeos::PrinterConfigurer::Create(profile)),
         weak_ptr_factory_(this) {
     printers_manager_->AddObserver(this);
@@ -311,7 +313,7 @@ class PrinterDiscoverySessionHostImpl
 
   mojom::PrinterDiscoverySessionInstancePtr instance_;
   ArcPrintServiceImpl* const service_;
-  std::unique_ptr<chromeos::CupsPrintersManager> printers_manager_;
+  chromeos::CupsPrintersManager* printers_manager_;
   std::unique_ptr<chromeos::PrinterConfigurer> configurer_;
   base::WeakPtrFactory<PrinterDiscoverySessionHostImpl> weak_ptr_factory_;
 

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

@@ -16,6 +16,7 @@
 #include "chrome/browser/chromeos/printing/cups_print_job_manager.h"
 #include "chrome/browser/chromeos/printing/cups_print_job_manager_factory.h"
 #include "chrome/browser/chromeos/printing/cups_printers_manager.h"
+#include "chrome/browser/chromeos/printing/cups_printers_manager_factory.h"
 #include "chrome/browser/chromeos/printing/ppd_provider_factory.h"
 #include "chrome/browser/chromeos/printing/printer_configurer.h"
 #include "chrome/browser/profiles/profile.h"
@@ -31,6 +32,7 @@
 namespace {
 
 using chromeos::CupsPrintersManager;
+using chromeos::CupsPrintersManagerFactory;
 
 // Store the name used in CUPS, Printer#id in |printer_name|, the description
 // as the system_driverinfo option value, and the Printer#display_name in
@@ -76,7 +78,9 @@ LocalPrinterHandlerChromeos::LocalPrinterHandlerChromeos(
     Profile* profile,
     content::WebContents* preview_web_contents)
     : preview_web_contents_(preview_web_contents),
-      printers_manager_(CupsPrintersManager::Create(profile)),
+      printers_manager_(
+          CupsPrintersManagerFactory::GetInstance()->GetForBrowserContext(
+              profile)),
       printer_configurer_(chromeos::PrinterConfigurer::Create(profile)),
       weak_factory_(this) {
   // Construct the CupsPrintJobManager to listen for printing events.

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

@@ -50,7 +50,7 @@ class LocalPrinterHandlerChromeos : public PrinterHandler {
                           chromeos::PrinterSetupResult result);
 
   content::WebContents* const preview_web_contents_;
-  std::unique_ptr<chromeos::CupsPrintersManager> printers_manager_;
+  chromeos::CupsPrintersManager* printers_manager_;
   scoped_refptr<chromeos::PpdProvider> ppd_provider_;
   std::unique_ptr<chromeos::PrinterConfigurer> printer_configurer_;
   base::WeakPtrFactory<LocalPrinterHandlerChromeos> weak_factory_;

chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc

@@ -20,6 +20,7 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/printing/cups_printers_manager.h"
+#include "chrome/browser/chromeos/printing/cups_printers_manager_factory.h"
 #include "chrome/browser/chromeos/printing/ppd_provider_factory.h"
 #include "chrome/browser/chromeos/printing/printer_configurer.h"
 #include "chrome/browser/chromeos/printing/printer_event_tracker.h"
@@ -181,7 +182,9 @@ CupsPrintersHandler::CupsPrintersHandler(content::WebUI* webui)
     : profile_(Profile::FromWebUI(webui)),
       ppd_provider_(CreatePpdProvider(profile_)),
       printer_configurer_(PrinterConfigurer::Create(profile_)),
-      printers_manager_(CupsPrintersManager::Create(profile_)),
+      printers_manager_(
+          CupsPrintersManagerFactory::GetInstance()->GetForBrowserContext(
+              profile_)),
       weak_factory_(this) {}
 
 CupsPrintersHandler::~CupsPrintersHandler() {}

chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h

@@ -174,7 +174,7 @@ class CupsPrintersHandler : public ::settings::SettingsPageUIHandler,
 
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
   std::string webui_callback_id_;
-  std::unique_ptr<CupsPrintersManager> printers_manager_;
+  CupsPrintersManager* printers_manager_;
 
   base::WeakPtrFactory<CupsPrintersHandler> weak_factory_;