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

dbus/end_to_end_sync_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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "dbus/test_service.h"
@@ skipping 19 matching lines @@
     dbus::Bus::Options client_bus_options;
     client_bus_options.bus_type = dbus::Bus::SESSION;
     client_bus_options.connection_type = dbus::Bus::PRIVATE;
     client_bus_ = new dbus::Bus(client_bus_options);
     object_proxy_ = client_bus_->GetObjectProxy("org.chromium.TestService",
                                                 "/org/chromium/TestObject");
     ASSERT_FALSE(client_bus_->HasDBusThread());
   }
 
   virtual void TearDown() {
-    test_service_->Shutdown();
-    ASSERT_TRUE(test_service_->WaitUntilServiceIsShutdown());
+    test_service_->ShutdownAndBlock();
     test_service_->Stop();
     client_bus_->ShutdownAndBlock();
   }
 
  protected:
   scoped_ptr<dbus::TestService> test_service_;
   scoped_refptr<dbus::Bus> client_bus_;
   dbus::ObjectProxy* object_proxy_;
 };
 
@@ skipping 44 matching lines @@
 }
 
 TEST_F(EndToEndSyncTest, BrokenMethod) {
   dbus::MethodCall method_call("org.chromium.TestInterface", "BrokenMethod");
 
   const int timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT;
   scoped_ptr<dbus::Response> response(
       object_proxy_->CallMethodAndBlock(&method_call, timeout_ms));
   ASSERT_FALSE(response.get());
 }