Simplify IqRequest interface.

remoting/host/heartbeat_sender_unittest.cc

 // 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.
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/heartbeat_sender.h"
@@ skipping 32 matching lines @@
     config_->SetString(kHostIdConfigPath, kHostId);
     config_->SetString(kPrivateKeyConfigPath, kTestHostKeyPair);
   }
 
   MockSignalStrategy signal_strategy_;
   MessageLoop message_loop_;
   scoped_refptr<InMemoryHostConfig> config_;
 };
 
 // Call Start() followed by Stop(), and makes sure an Iq stanza is
 // being send.

[Wez, 2011/08/31 03:42:34]

nit: send -> sent.

[Sergey Ulanov, 2011/08/31 23:26:27]

Done.

 TEST_F(HeartbeatSenderTest, DoSendStanza) {
   // |iq_request| is freed by HeartbeatSender.
   MockIqRequest* iq_request = new MockIqRequest();
   iq_request->Init();
 
   EXPECT_CALL(*iq_request, set_callback(_)).Times(1);
 
   scoped_ptr<HeartbeatSender> heartbeat_sender(
       new HeartbeatSender(base::MessageLoopProxy::current(),
                           config_));
   ASSERT_TRUE(heartbeat_sender->Init());
 
   EXPECT_CALL(signal_strategy_, CreateIqRequest())
       .WillOnce(Return(iq_request));
 
-  EXPECT_CALL(*iq_request, SendIq(buzz::STR_SET, kChromotingBotJid, NotNull()))
-      .WillOnce(DoAll(DeleteArg<2>(), Return()));
+  EXPECT_CALL(*iq_request, SendIq(NotNull()))

[Wez, 2011/08/31 03:42:34]

We don't care about the content for this test any more?

[Sergey Ulanov, 2011/08/31 23:26:27]

Done.

+      .WillOnce(DoAll(DeleteArg<0>(), Return()));
 
   heartbeat_sender->OnSignallingConnected(&signal_strategy_, kTestJid);
   message_loop_.RunAllPending();
 
   heartbeat_sender->OnSignallingDisconnected();
   message_loop_.RunAllPending();
 }
 
 // Validate format of the heartbeat stanza.
 TEST_F(HeartbeatSenderTest, CreateHeartbeatMessage) {
@@ skipping 51 matching lines @@
 
   scoped_ptr<HeartbeatSender> heartbeat_sender(
       new HeartbeatSender(base::MessageLoopProxy::current(),
                           config_));
   heartbeat_sender->ProcessResponse(response.get());
 
   EXPECT_EQ(kTestInterval * 1000, heartbeat_sender->interval_ms_);
 }
 
 }  // namespace remoting