Revert 123635 - Implement timeouts for IQ requests.

remoting/jingle_glue/iq_sender.h

 // Copyright (c) 2012 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 REMOTING_JINGLE_GLUE_IQ_SENDER_H_
 #define REMOTING_JINGLE_GLUE_IQ_SENDER_H_
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 
 namespace buzz {
 class XmlElement;
 }  // namespace buzz
 
 namespace remoting {
 
 class IqRequest;
 class SignalStrategy;
 
 // IqSender handles sending iq requests and routing of responses to
 // those requests.
 class IqSender : public SignalStrategy::Listener {
  public:
-  // Callback that is called when an Iq response is received. Called
-  // with the |response| set to NULL in case of a timeout.
-  typedef base::Callback<void(IqRequest* request,
-                              const buzz::XmlElement* response)> ReplyCallback;
+  typedef base::Callback<void(const buzz::XmlElement*)> ReplyCallback;
 
   explicit IqSender(SignalStrategy* signal_strategy);
   virtual ~IqSender();
 
   // Send an iq stanza. Returns an IqRequest object that represends
   // the request. |callback| is called when response to |stanza| is
   // received. Destroy the returned IqRequest to cancel the callback.
   // Caller must take ownership of the result. Result must be
   // destroyed before sender is destroyed.
   scoped_ptr<IqRequest> SendIq(scoped_ptr<buzz::XmlElement> stanza,
@@ skipping 24 matching lines @@
   // Removes |request| from the list of pending requests. Called by IqRequest.
   void RemoveRequest(IqRequest* request);
 
   SignalStrategy* signal_strategy_;
   IqRequestMap requests_;
 
   DISALLOW_COPY_AND_ASSIGN(IqSender);
 };
 
 // This call must only be used on the thread it was created on.
-class IqRequest : public  base::SupportsWeakPtr<IqRequest> {
+class IqRequest {
  public:
-  IqRequest(IqSender* sender, const IqSender::ReplyCallback& callback,
-            const std::string& addressee);
+  IqRequest(IqSender* sender, const IqSender::ReplyCallback& callback);
   ~IqRequest();
 
-  // Sets timeout for the request. When the timeout expires the
-  // callback is called with the |response| set to NULL.
-  void SetTimeout(base::TimeDelta timeout);
-
  private:
   friend class IqSender;
 
-  void CallCallback(const buzz::XmlElement* stanza);
-  void OnTimeout();
-
   // Called by IqSender when a response is received.
   void OnResponse(const buzz::XmlElement* stanza);
 
   IqSender* sender_;
   IqSender::ReplyCallback callback_;
-  std::string addressee_;
 
   DISALLOW_COPY_AND_ASSIGN(IqRequest);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_JINGLE_GLUE_IQ_SENDER_H_