Revert 99801 - 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"
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/in_memory_host_config.h"
 #include "remoting/host/test_key_pair.h"
 #include "remoting/jingle_glue/iq_request.h"
 #include "remoting/jingle_glue/mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 using testing::_;
 using testing::DeleteArg;
 using testing::DoAll;
 using testing::Invoke;
 using testing::NotNull;
 using testing::Return;
-using testing::SaveArg;
 
 namespace remoting {
 
 namespace {
 const char kHostId[] = "0";
 const char kTestJid[] = "user@gmail.com/chromoting123";
 const int64 kTestTime = 123123123;
 }  // namespace
 
 class HeartbeatSenderTest : public testing::Test {
  protected:
   virtual void SetUp() {
     config_ = new InMemoryHostConfig();
     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 sent.
+// being send.
 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));
 
-  XmlElement* sent_iq = NULL;
-  EXPECT_CALL(*iq_request, SendIq(NotNull()))
-      .WillOnce(SaveArg<0>(&sent_iq));
+  EXPECT_CALL(*iq_request, SendIq(buzz::STR_SET, kChromotingBotJid, NotNull()))
+      .WillOnce(DoAll(DeleteArg<2>(), Return()));
 
   heartbeat_sender->OnSignallingConnected(&signal_strategy_, kTestJid);
   message_loop_.RunAllPending();
 
-  scoped_ptr<XmlElement> stanza(sent_iq);
-  ASSERT_TRUE(stanza != NULL);
-
-  EXPECT_EQ(stanza->Attr(buzz::QName("", "to")), kChromotingBotJid);
-  EXPECT_EQ(stanza->Attr(buzz::QName("", "type")), "set");
-
   heartbeat_sender->OnSignallingDisconnected();
   message_loop_.RunAllPending();
 }
 
 // Validate format of the heartbeat stanza.
 TEST_F(HeartbeatSenderTest, CreateHeartbeatMessage) {
   scoped_ptr<HeartbeatSender> heartbeat_sender(
       new HeartbeatSender(base::MessageLoopProxy::current(),
                           config_));
   ASSERT_TRUE(heartbeat_sender->Init());
@@ skipping 47 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