Revert 123635 - Implement timeouts for IQ requests.

remoting/host/heartbeat_sender_unittest.cc

 // 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.
 
 #include "remoting/host/heartbeat_sender.h"
 
 #include <set>
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 158 matching lines @@
   scoped_ptr<XmlElement> response(new XmlElement(buzz::QN_IQ));
   response->AddAttr(QName("", "type"), "result");
   XmlElement* result = new XmlElement(
       QName(kChromotingXmlNamespace, "heartbeat-result"));
   response->AddElement(result);
   XmlElement* expected_sequence_id = new XmlElement(
       QName(kChromotingXmlNamespace, "expected-sequence-id"));
   result->AddElement(expected_sequence_id);
   const int kExpectedSequenceId = 456;
   expected_sequence_id->AddText(base::IntToString(kExpectedSequenceId));
-  heartbeat_sender_->ProcessResponse(NULL, response.get());
+  heartbeat_sender_->ProcessResponse(response.get());
   message_loop_.RunAllPending();
 
   scoped_ptr<XmlElement> stanza2(sent_iq2);
   ASSERT_TRUE(stanza2 != NULL);
   ValidateHeartbeatStanza(stanza2.get(),
                           base::IntToString(kExpectedSequenceId).c_str());
 
   heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::DISCONNECTED);
   message_loop_.RunAllPending();
 }
 
 // Verify that ProcessResponse parses set-interval result.
 TEST_F(HeartbeatSenderTest, ProcessResponseSetInterval) {
   scoped_ptr<XmlElement> response(new XmlElement(buzz::QN_IQ));
   response->AddAttr(QName("", "type"), "result");
 
   XmlElement* result = new XmlElement(
       QName(kChromotingXmlNamespace, "heartbeat-result"));
   response->AddElement(result);
 
   XmlElement* set_interval = new XmlElement(
       QName(kChromotingXmlNamespace, "set-interval"));
   result->AddElement(set_interval);
 
   const int kTestInterval = 123;
   set_interval->AddText(base::IntToString(kTestInterval));
 
-  heartbeat_sender_->ProcessResponse(NULL, response.get());
+  heartbeat_sender_->ProcessResponse(response.get());
 
   EXPECT_EQ(kTestInterval * 1000, heartbeat_sender_->interval_ms_);
 }
 
 // Validate a heartbeat stanza.
 void HeartbeatSenderTest::ValidateHeartbeatStanza(
     XmlElement* stanza, const char* expectedSequenceId) {
   EXPECT_EQ(stanza->Attr(buzz::QName("", "to")),
             std::string(kChromotingBotJid));
   EXPECT_EQ(stanza->Attr(buzz::QName("", "type")), "set");
@@ skipping 11 matching lines @@
   EXPECT_TRUE(heartbeat_stanza->NextNamed(signature_tag) == NULL);
 
   HostKeyPair key_pair;
   key_pair.LoadFromString(kTestHostKeyPair);
   std::string expected_signature =
       key_pair.GetSignature(std::string(kTestJid) + ' ' + expectedSequenceId);
   EXPECT_EQ(expected_signature, signature->BodyText());
 }
 
 }  // namespace remoting