Revert 111479 - chrome: dbus: support asynchronous method replies

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"
 #include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
-#include "dbus/exported_object.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace dbus {
 
 class Bus;
+class ExportedObject;
 class MethodCall;
 class Response;
 
 // The test service is used for end-to-end tests.  The service runs in a
 // separate thread, so it does not interfere the test code that runs in
 // the main thread.
 //
 // The test service exports an object with methods such as Echo() and
 // SlowEcho(). The object has ability to send "Test" signal.
 class TestService : public base::Thread {
@@ skipping 50 matching lines @@
                   bool success);
 
   // base::Thread override.
   virtual void Run(MessageLoop* message_loop) OVERRIDE;
 
   //
   // Exported methods.
   //
 
   // Echos the text message received from the method call.
-  void Echo(MethodCall* method_call,
-            dbus::ExportedObject::ResponseSender response_sender);
+  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.
-  void SlowEcho(MethodCall* method_call,
-                dbus::ExportedObject::ResponseSender response_sender);
-
-  // Echos the text message received from the method call, but sends its
-  // response asynchronously after this callback has returned.
-  void AsyncEcho(MethodCall* method_call,
-                 dbus::ExportedObject::ResponseSender response_sender);
+  Response* SlowEcho(MethodCall* method_call);
 
   // Returns NULL, instead of a valid Response.
-  void BrokenMethod(MethodCall* method_call,
-                    dbus::ExportedObject::ResponseSender response_sender);
+  Response* BrokenMethod(MethodCall* method_call);
 
   scoped_refptr<base::MessageLoopProxy> dbus_thread_message_loop_proxy_;
   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_