Allow dbus clients to silence logging when a service is unavailable.

dbus/object_proxy.h

 // Copyright (c) 2011 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 DBUS_OBJECT_PROXY_H_
 #define DBUS_OBJECT_PROXY_H_
 #pragma once
 
 #include <dbus/dbus.h>
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "base/string_piece.h"
 #include "base/time.h"
 
 namespace dbus {
 
 class Bus;
 class MethodCall;
 class Response;
 class Signal;
 
 // ObjectProxy is used to communicate with remote objects, mainly for
 // calling methods of these objects.
 //
 // ObjectProxy is a ref counted object, to ensure that |this| of the
 // object is is alive when callbacks referencing |this| are called.
 class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> {
  public:
-  // Client code should use Bus::GetObjectProxy() instead of this
-  // constructor.
+  // Client code should use Bus::GetObjectProxy() or
+  // Bus::GetObjectProxyWithOptions() instead of this constructor.
   ObjectProxy(Bus* bus,
               const std::string& service_name,
-              const std::string& object_path);
+              const std::string& object_path,
+              int options);
+
+  // Options to be OR-ed together when calling Bus::GetObjectProxyWithOptions().
+  // Set the IGNORE_SERVICE_UNKNOWN_ERRORS option to silence logging of
+  // org.freedesktop.DBus.Error.ServiceUnknown errors.
+  enum Options {
+    DEFAULT_OPTIONS = 0,
+    IGNORE_SERVICE_UNKNOWN_ERRORS = 1 << 0
+  };
 
   // Special timeout constants.
   //
   // The constants correspond to DBUS_TIMEOUT_USE_DEFAULT and
   // DBUS_TIMEOUT_INFINITE. Here we use literal numbers instead of these
   // macros as these aren't defined with D-Bus earlier than 1.4.12.
   enum {
     TIMEOUT_USE_DEFAULT = -1,
     TIMEOUT_INFINITE = 0x7fffffff,
   };
@@ skipping 125 matching lines @@
   // Runs the method. Helper function for HandleMessage().
   void RunMethod(base::TimeTicks start_time,
                  SignalCallback signal_callback,
                  Signal* signal);
 
   // Redirects the function call to HandleMessage().
   static DBusHandlerResult HandleMessageThunk(DBusConnection* connection,
                                               DBusMessage* raw_message,
                                               void* user_data);
 
+  // Helper method for logging response errors appropriately.
+  void LogMethodCallFailure(const base::StringPiece& error_name,
+                            const base::StringPiece& error_message) const;
+
   scoped_refptr<Bus> bus_;
   std::string service_name_;
   std::string object_path_;
 
   // True if the message filter was added.
   bool filter_added_;
 
   // The method table where keys are absolute signal names (i.e. interface
   // name + signal name), and values are the corresponding callbacks.
   typedef std::map<std::string, SignalCallback> MethodTable;
   MethodTable method_table_;
 
   std::set<std::string> match_rules_;
 
+  const bool ignore_service_unknown_errors_;
+
   DISALLOW_COPY_AND_ASSIGN(ObjectProxy);
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_OBJECT_PROXY_H_