Minor cleanups and improvements for the D-Bus library.

dbus/end_to_end_async_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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "dbus/test_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The end-to-end test exercises the asynchronos APIs in ObjectProxy and
 // ExportedObject.
 class EndToEndAsyncTest : public testing::Test {
  public:
   EndToEndAsyncTest() {
   }
 
-  void SetUp() {
+  virtual void SetUp() {
     // Make the main thread not to allow IO.
     base::ThreadRestrictions::SetIOAllowed(false);
 
     // Start the D-Bus thread.
     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
     base::Thread::Options thread_options;
     thread_options.message_loop_type = MessageLoop::TYPE_IO;
     ASSERT_TRUE(dbus_thread_->StartWithOptions(thread_options));
 
     // Start the test service, using the D-Bus thread.
@@ skipping 19 matching lines @@
         "org.chromium.TestInterface",
         "Test",
         base::Bind(&EndToEndAsyncTest::OnTestSignal,
                    base::Unretained(this)),
         base::Bind(&EndToEndAsyncTest::OnConnected,
                    base::Unretained(this)));
     // Wait until the object proxy is connected to the signal.
     message_loop_.Run();
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     bus_->Shutdown(base::Bind(&EndToEndAsyncTest::OnShutdown,
                               base::Unretained(this)));
     // Wait until the bus is shutdown. OnShutdown() will be called in
     // mesage_loop_.
     message_loop_.Run();
 
     // Shut down the service.
     test_service_->Shutdown();
     ASSERT_TRUE(test_service_->WaitUntilServiceIsShutdown());
 
@@ skipping 157 matching lines @@
 
 TEST_F(EndToEndAsyncTest, TestSignal) {
   const char kMessage[] = "hello, world";
   // Send the test signal from the exported object.
   test_service_->SendTestSignal(kMessage);
   // Receive the signal with the object proxy. The signal is handeled in
   // EndToEndAsyncTest::OnTestSignal() in the main thread.
   WaitForTestSignal();
   ASSERT_EQ(kMessage, test_signal_string_);
 }