diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 03:51:56 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 03:51:56 +0000 |
| commit | 740d451cf5222a5046d63029a88e58c7204c6ba2 (patch) | |
| tree | 43b3a71eb8c9d23e48f31434cc3c2ef2e85ef877 /remoting/host/heartbeat_sender_unittest.cc | |
| parent | 426199abc7929b84c80df803b828f3f9c47b4b6d (diff) | |
| download | chromium_src-740d451cf5222a5046d63029a88e58c7204c6ba2.zip chromium_src-740d451cf5222a5046d63029a88e58c7204c6ba2.tar.gz chromium_src-740d451cf5222a5046d63029a88e58c7204c6ba2.tar.bz2 | |
Revert 123635 - Implement timeouts for IQ requests.
Now the IqRequest class supports setting timeouts for each request, and
JingleSession uses it to disconnect if no response is receive within 10
secons from a request.
BUG=107925
Review URL: http://codereview.chromium.org/9452038
TBR=sergeyu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9447087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/heartbeat_sender_unittest.cc')
| -rw-r--r-- | remoting/host/heartbeat_sender_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc index f94726d..08f3267 100644 --- a/remoting/host/heartbeat_sender_unittest.cc +++ b/remoting/host/heartbeat_sender_unittest.cc @@ -176,7 +176,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaWithExpectedSequenceId) { 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); @@ -204,7 +204,7 @@ TEST_F(HeartbeatSenderTest, ProcessResponseSetInterval) { 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_); } |