Revert 111479 - chrome: dbus: support asynchronous method replies

chrome/browser/chromeos/dbus/proxy_resolution_service_provider.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 CHROME_BROWSER_CHROMEOS_DBUS_PROXY_RESOLUTION_SERVICE_PROVIDER_H_
 #define CHROME_BROWSER_CHROMEOS_DBUS_PROXY_RESOLUTION_SERVICE_PROVIDER_H_
 #pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
-#include "dbus/exported_object.h"
 
 namespace dbus {
+class ExportedObject;
 class MethodCall;
 class Response;
 }
 
 namespace chromeos {
 
 class ProxyResolverInterface;
 
 // This class provides proxy resolution service for CrosDBusService.
 // It processes proxy resolution requests for ChromeOS clients.
@@ skipping 66 matching lines @@
 
   // Called from ExportedObject, when ResolveProxyHandler() is exported as
   // a D-Bus method, or failed to be exported.
   void OnExported(const std::string& interface_name,
                   const std::string& method_name,
                   bool success);
 
   // Callback to be invoked when ChromeOS clients send network proxy
   // resolution requests to the service running in chrome executable.
   // Called on UI thread from dbus request.
-  void ResolveProxyHandler(dbus::MethodCall* method_call,
-      dbus::ExportedObject::ResponseSender response_sender);
+  dbus::Response* ResolveProxyHandler(dbus::MethodCall* method_call);
 
   // Calls ResolveProxyHandler() if weak_ptr is not NULL. Used to ensure a
   // safe shutdown.
-  static void CallResolveProxyHandler(
+  static dbus::Response* CallResolveProxyHandler(
       base::WeakPtr<ProxyResolutionServiceProvider> weak_ptr,
-      dbus::MethodCall* method_call,
-      dbus::ExportedObject::ResponseSender response_sender);
+      dbus::MethodCall* method_call);
 
   // Returns true if the current thread is on the origin thread.
   bool OnOriginThread();
 
   scoped_refptr<dbus::ExportedObject> exported_object_;
   scoped_ptr<ProxyResolverInterface> resolver_;
   base::PlatformThreadId origin_thread_id_;
   base::WeakPtrFactory<ProxyResolutionServiceProvider> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyResolutionServiceProvider);
@@ skipping 16 matching lines @@
       const std::string& signal_interface,
       const std::string& signal_name,
       scoped_refptr<dbus::ExportedObject> exported_object) = 0;
 
   virtual ~ProxyResolverInterface();
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_DBUS_PROXY_RESOLUTION_SERVICE_PROVIDER_H_