Completely rewrite the PpdProvider/PpdCache to use the SCS backend. Along the way, clean it up a l…

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CUPS_PRINTERS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CUPS_PRINTERS_HANDLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 31 matching lines @@
   void OnJavascriptAllowed() override {}
   void OnJavascriptDisallowed() override {}
 
  private:
   // Gets all CUPS printers and return it to WebUI.
   void HandleGetCupsPrintersList(const base::ListValue* args);
   void HandleUpdateCupsPrinter(const base::ListValue* args);
   void HandleRemoveCupsPrinter(const base::ListValue* args);
 
   void HandleAddCupsPrinter(const base::ListValue* args);
-  void OnAddedPrinter(std::unique_ptr<Printer> printer, bool success);
+  void OnAddedPrinter(std::unique_ptr<Printer> printer, int32_t result);
   void OnAddPrinterError();
 
   // Get a list of all manufacturers for which we have at least one model of
   // printer supported.  Takes one argument, the callback id for the result.
   // The callback will be invoked with {success: <boolean>, models:
   // <Array<string>>}.
   void HandleGetCupsPrinterManufacturers(const base::ListValue* args);
 
   // Given a manufacturer, get a list of all models of printers for which we can
   // get drivers.  Takes two arguments - the callback id and the manufacturer
   // name for which we want to list models.  The callback will be called with
   // {success: <boolean>, models: Array<string>}.
   void HandleGetCupsPrinterModels(const base::ListValue* args);
 
   void HandleSelectPPDFile(const base::ListValue* args);
 
   // PpdProvider callback handlers.
-  void QueryAvailableManufacturersDone(
+  void ResolveManufacturersDone(
       const std::string& js_callback,
       chromeos::printing::PpdProvider::CallbackResultCode result_code,
-      const chromeos::printing::PpdProvider::AvailablePrintersMap& available);
-  void QueryAvailableModelsDone(
+      const std::vector<std::string>& available);
+  void ResolvePrintersDone(
       const std::string& js_callback,
-      const std::string& manufacturer,
       chromeos::printing::PpdProvider::CallbackResultCode result_code,
-      const chromeos::printing::PpdProvider::AvailablePrintersMap& available);
+      const std::vector<std::string>& available);
 
   // ui::SelectFileDialog::Listener override:
   void FileSelected(const base::FilePath& path,
                     int index,
                     void* params) override;
 
   void HandleStartDiscovery(const base::ListValue* args);
   void HandleStopDiscovery(const base::ListValue* args);
 
   // chromeos::PrinterDiscoverer::Observer override:
   void OnPrintersFound(const std::vector<Printer>& printers) override;
   void OnDiscoveryDone() override;
 
   // Invokes debugd to add the printer to CUPS.  If |ipp_everywhere| is true,
   // automatic configuration will be attempted  and |ppd_path| is ignored.
   // |ppd_path| is the path to a Postscript Printer Description file that will
   // be used to configure the printer capabilities.  This file must be in
   // Downloads or the PPD Cache.
   void AddPrinterToCups(std::unique_ptr<Printer> printer,
                         const base::FilePath& ppd_path,
                         bool ipp_everywhere);
 
   // Callback for PpdProvider::ResolveCallback.
-  void OnPPDResolved(std::unique_ptr<Printer> printer,
-                     printing::PpdProvider::CallbackResultCode result,
-                     base::FilePath ppd_path);
+  void ResolvePpdDone(std::unique_ptr<Printer> printer,
+                      printing::PpdProvider::CallbackResultCode result,
+                      const std::string& ppd_contents);
 
   std::unique_ptr<chromeos::PrinterDiscoverer> printer_discoverer_;
-  std::unique_ptr<chromeos::printing::PpdProvider> ppd_provider_;
+  scoped_refptr<chromeos::printing::PpdProvider> ppd_provider_;
 
   Profile* profile_;
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
   std::string webui_callback_id_;
 
   base::WeakPtrFactory<CupsPrintersHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CupsPrintersHandler);
 };
 
 }  // namespace settings
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CUPS_PRINTERS_HANDLER_H_