Update debugd client.

chromeos/dbus/debug_daemon_client.h

 // Copyright (c) 2012 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 CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
 #define CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_
 
 #include <stdint.h>
 #include <sys/types.h>
 
@@ skipping 192 matching lines @@
 
   // Set OOM score oom_score_adj for some process.
   // Note that the corresponding DBus configuration of the debugd method
   // "SetOomScoreAdj" only permits setting OOM score for processes running by
   // user chronos or Android apps.
   virtual void SetOomScoreAdj(
       const std::map<pid_t, int32_t>& pid_to_oom_score_adj,
       const SetOomScoreAdjCallback& callback) = 0;
 
   // A callback to handle the result of CupsAddPrinter.
-  using CupsAddPrinterCallback = base::Callback<void(bool success)>;
+  using LegacyCupsAddPrinterCallback = base::Callback<void(bool status)>;
+
+  // A callback to handle the result of CupsAdd[Auto|Manually]ConfiguredPrinter.
+  // A zero status means success, non-zero statuses are used to convey different
+  // errors.
+  using CupsAddPrinterCallback = base::Callback<void(int32_t status)>;

[skau, 2017/01/25 00:16:40]

Are you going to use u or i in the dbus specification? If you use u, this should
be a uint32_t

[Carlson, 2017/01/25 00:32:35]

Was planning to use int32_t; is there a reason you want to go unsigned?

 
   // Calls CupsAddPrinter.  |name| is the printer name. |uri| is the device
   // uri. |ppd_path| is the absolute path to the PPD file. |ipp_everywhere|
   // is true for autoconf of IPP Everywhere printers.  |callback| is called with
   // true if adding the printer to CUPS was successful and false if there was an
   // error.  |error_callback| will be called if there was an error in
   // communicating with debugd.
+  //
+  // Obsoleted by CupsAddAutoConfiguredPrinter and
+  // CupsAddManuallyConfiguredPrinter.
   virtual void CupsAddPrinter(const std::string& name,
                               const std::string& uri,
                               const std::string& ppd_path,
                               bool ipp_everywhere,
-                              const CupsAddPrinterCallback& callback,
+                              const LegacyCupsAddPrinterCallback& callback,
                               const base::Closure& error_callback) = 0;
 
+  // Calls CupsAddManuallyConfiguredPrinter.  |name| is the printer
+  // name. |uri| is the device.  |ppd_contents| is the contents of the
+  // PPD file used to drive the device.  |callback| is called with
+  // true if adding the printer to CUPS was successful and false if
+  // there was an error.  |error_callback| will be called if there was
+  // an error in communicating with debugd.
+  virtual void CupsAddManuallyConfiguredPrinter(
+      const std::string& name,
+      const std::string& uri,
+      const std::string& ppd_contents,
+      const CupsAddPrinterCallback& callback,
+      const base::Closure& error_callback) = 0;
+
+  // Calls CupsAddAutoConfiguredPrinter.  |name| is the printer
+  // name. |uri| is the device.  |callback| is called with true if
+  // adding the printer to CUPS was successful and false if there was
+  // an error.  |error_callback| will be called if there was an error
+  // in communicating with debugd.
+  virtual void CupsAddAutoConfiguredPrinter(
+      const std::string& name,
+      const std::string& uri,
+      const CupsAddPrinterCallback& callback,
+      const base::Closure& error_callback) = 0;
+
   // A callback to handle the result of CupsRemovePrinter.
   using CupsRemovePrinterCallback = base::Callback<void(bool success)>;
 
   // Calls CupsRemovePrinter.  |name| is the printer name as registered in
   // CUPS.  |callback| is called with true if removing the printer from CUPS was
   // successful and false if there was an error.  |error_callback| will be
   // called if there was an error in communicating with debugd.
   virtual void CupsRemovePrinter(const std::string& name,
                                  const CupsRemovePrinterCallback& callback,
                                  const base::Closure& error_callback) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static DebugDaemonClient* Create();
 
  protected:
   // Create() should be used instead.
   DebugDaemonClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DebugDaemonClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DEBUG_DAEMON_CLIENT_H_