Fix a bug in dbus::Bus::AddFilterFunction().

dbus/bus_unittest.cc

 // 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.
 
 #include "dbus/bus.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "dbus/exported_object.h"
 #include "dbus/object_proxy.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace {
+
+// Used to test AddFilterFunction().
+DBusHandlerResult DummyHandler(DBusConnection* connection,
+                               DBusMessage* raw_message,
+                               void* user_data) {
+  return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+}  // namespace
+
 TEST(BusTest, GetObjectProxy) {
   dbus::Bus::Options options;
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
 
   dbus::ObjectProxy* object_proxy1 =
       bus->GetObjectProxy("org.chromium.TestService",
                           "/org/chromium/TestObject");
   ASSERT_TRUE(object_proxy1);
 
   // This should return the same object.
@@ skipping 56 matching lines @@
   dbus::Bus::Options options;
   options.dbus_thread_message_loop_proxy = dbus_thread.message_loop_proxy();
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
   ASSERT_FALSE(bus->shutdown_completed());
 
   // Shut down synchronously.
   bus->ShutdownOnDBusThreadAndBlock();
   EXPECT_TRUE(bus->shutdown_completed());
   dbus_thread.Stop();
 }
+
+TEST(BusTest, AddFilterFunction) {
+  dbus::Bus::Options options;
+  scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
+  // Should connect before calling AddFilterFunction().
+  bus->Connect();
+
+  int data1 = 100;
+  int data2 = 200;
+  ASSERT_TRUE(bus->AddFilterFunction(&DummyHandler, &data1));
+  // Cannot add the same function with the same data.
+  ASSERT_FALSE(bus->AddFilterFunction(&DummyHandler, &data1));
+  // Can add the same function with different data.
+  ASSERT_TRUE(bus->AddFilterFunction(&DummyHandler, &data2));
+
+  ASSERT_TRUE(bus->RemoveFilterFunction(&DummyHandler, &data1));
+  ASSERT_FALSE(bus->RemoveFilterFunction(&DummyHandler, &data1));
+  ASSERT_TRUE(bus->RemoveFilterFunction(&DummyHandler, &data2));
+
+  bus->ShutdownAndBlock();
+}