DBus: Fixes a flaky test case.

dbus/bus_unittest.cc

 // 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.
 
 #include "dbus/bus.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
@@ skipping 90 matching lines @@
   // This should not.
   dbus::ExportedObject* object_proxy3 =
       bus->GetExportedObject(
           dbus::ObjectPath("/org/chromium/DifferentTestObject"));
   ASSERT_TRUE(object_proxy3);
   EXPECT_NE(object_proxy1, object_proxy3);
 
   bus->ShutdownAndBlock();
 }
 
-// http://crbug.com/137846
-TEST(BusTest, DISABLED_UnregisterExportedObject) {
+TEST(BusTest, UnregisterExportedObject) {
   // Start the D-Bus thread.
   base::Thread::Options thread_options;
   thread_options.message_loop_type = MessageLoop::TYPE_IO;
   base::Thread dbus_thread("D-Bus thread");
   dbus_thread.StartWithOptions(thread_options);
 
   // Create the bus.
   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());
 
   dbus::ExportedObject* object_proxy1 =
       bus->GetExportedObject(dbus::ObjectPath("/org/chromium/TestObject"));
   ASSERT_TRUE(object_proxy1);
 
+  // Increment the reference count to the object proxy to avoid destroying it
+  // calling UnregisterExportedObject. This ensures the dbus::ExportedObject is
+  // not freed from memory. See http://crbug.com/137846 for details.
+  object_proxy1->AddRef();
+
   bus->UnregisterExportedObject(dbus::ObjectPath("/org/chromium/TestObject"));
 
-  // This should return a new object.
+  // This should return a new object because the object_proxy1 is still in
+  // alloc'ed memory.
   dbus::ExportedObject* object_proxy2 =
       bus->GetExportedObject(dbus::ObjectPath("/org/chromium/TestObject"));
   ASSERT_TRUE(object_proxy2);
   EXPECT_NE(object_proxy1, object_proxy2);
 
+  // Release the incremented reference.
+  object_proxy1->Release();
+
   // Shut down synchronously.
   bus->ShutdownOnDBusThreadAndBlock();
   EXPECT_TRUE(bus->shutdown_completed());
   dbus_thread.Stop();
 }
 
 TEST(BusTest, ShutdownAndBlock) {
   dbus::Bus::Options options;
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
   ASSERT_FALSE(bus->shutdown_completed());
@@ skipping 35 matching lines @@
   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();
 }