Add Bus::ShutdownOnDBusThreadAndBlock() and remove bus::Shutdown()

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"
@@ skipping 48 matching lines @@
         "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();
   }
 
   virtual void TearDown() {
-    bus_->Shutdown(base::Bind(&EndToEndAsyncTest::OnShutdown,
-                              base::Unretained(this)));
-    // Wait until the bus is shutdown. OnShutdown() will be called in
-    // message_loop_.
-    message_loop_.Run();
+    bus_->ShutdownOnDBusThreadAndBlock();
 
     // Shut down the service.
-    test_service_->Shutdown();
-    ASSERT_TRUE(test_service_->WaitUntilServiceIsShutdown());
+    test_service_->ShutdownAndBlock();
 
     // Reset to the default.
     base::ThreadRestrictions::SetIOAllowed(true);
 
     // Stopping a thread is considered an IO operation, so do this after
     // allowing IO.
     test_service_->Stop();
   }
 
  protected:
@@ skipping 22 matching lines @@
       dbus::MessageReader reader(response);
       std::string response_string;
       ASSERT_TRUE(reader.PopString(&response_string));
       response_strings_.push_back(response_string);
     } else {
       response_strings_.push_back("");
     }
     message_loop_.Quit();
   };
 
-  // Called when the shutdown is complete.
-  void OnShutdown() {
-    message_loop_.Quit();
-  }
-
   // Called when the "Test" signal is received, in the main thread.
   // Copy the string payload to |test_signal_string_|.
   void OnTestSignal(dbus::Signal* signal) {
     dbus::MessageReader reader(signal);
     ASSERT_TRUE(reader.PopString(&test_signal_string_));
     message_loop_.Quit();
   }
 
   // Called when connected to the signal.
   void OnConnected(const std::string& interface_name,
@@ skipping 101 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 handled in
   // EndToEndAsyncTest::OnTestSignal() in the main thread.
   WaitForTestSignal();
   ASSERT_EQ(kMessage, test_signal_string_);
 }