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

dbus/test_service.h

 // 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.
 
 #ifndef DBUS_TEST_SERVICE_H_
 #define DBUS_TEST_SERVICE_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ skipping 31 matching lines @@
   virtual ~TestService();
 
   // Starts the service in a separate thread.
   // Returns true if the thread is started successfully.
   bool StartService();
 
   // Waits until the service is started (i.e. all methods are exported).
   // Returns true on success.
   bool WaitUntilServiceIsStarted() WARN_UNUSED_RESULT;
 
-  // Shuts down the service.
-  void Shutdown();
-
-  // Waits until the service is shut down.
-  // Returns true on success.
-  bool WaitUntilServiceIsShutdown() WARN_UNUSED_RESULT;
+  // Shuts down the service and blocks until it's done.
+  void ShutdownAndBlock();
 
   // Returns true if the bus has the D-Bus thread.
   bool HasDBusThread();
 
   // Sends "Test" signal with the given message from the exported object.
   void SendTestSignal(const std::string& message);
 
  private:
   // Helper function for SendTestSignal().
   void SendTestSignalInternal(const std::string& message);
 
-  // Helper function for Shutdown().
-  void ShutdownInternal();
+  // Helper function for ShutdownAndBlock().
+  void ShutdownAndBlockInternal();
 
   // Called when a method is exported.
   void OnExported(const std::string& interface_name,
                   const std::string& method_name,
                   bool success);
 
-  // Called when the bus is shut down.
-  void OnShutdown();
-
   // base::Thread override.
   virtual void Run(MessageLoop* message_loop);
 
   //
   // Exported methods.
   //
 
   // Echos the text message received from the method call.
   Response* Echo(MethodCall* method_call);
 
   // Echos the text message received from the method call, but sleeps for
   // TestTimeouts::tiny_timeout_ms() before returning the response.
   Response* SlowEcho(MethodCall* method_call);
 
   // Returns NULL, instead of a valid Response.
   Response* BrokenMethod(MethodCall* method_call);
 
   base::Thread* dbus_thread_;
-  base::WaitableEvent on_shutdown_;
   base::WaitableEvent on_all_methods_exported_;
   // The number of methods actually exported.
   int num_exported_methods_;
 
   scoped_refptr<Bus> bus_;
   ExportedObject* exported_object_;
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_TEST_SERVICE_H_