Use SignalingAddress in SignalStrategy insterface.

remoting/host/host_change_notification_listener_unittest.cc

 // Copyright (c) 2013 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/host_change_notification_listener.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/signaling/mock_signal_strategy.h"
+#include "remoting/signaling/signaling_address.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
 #include "third_party/libjingle_xmpp/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 using testing::NotNull;
 using testing::Return;
@@ skipping 11 matching lines @@
 }
 
 ACTION_P(RemoveListener, list) {
   EXPECT_TRUE(list->find(arg0) != list->end());
   list->erase(arg0);
 }
 
 
 class HostChangeNotificationListenerTest : public testing::Test {
  protected:
+  HostChangeNotificationListenerTest()
+      : signal_strategy_(SignalingAddress(kTestJid)) {}
   class MockListener : public HostChangeNotificationListener::Listener {
    public:
     MOCK_METHOD0(OnHostDeleted, void());
   };
 
   void SetUp() override {
     EXPECT_CALL(signal_strategy_, AddListener(NotNull()))
         .WillRepeatedly(AddListener(&signal_strategy_listeners_));
     EXPECT_CALL(signal_strategy_, RemoveListener(NotNull()))
         .WillRepeatedly(RemoveListener(&signal_strategy_listeners_));
-    EXPECT_CALL(signal_strategy_, GetLocalJid())
-        .WillRepeatedly(Return(kTestJid));
 
     host_change_notification_listener_.reset(new HostChangeNotificationListener(
         &mock_listener_, kHostId, &signal_strategy_, kTestBotJid));
   }
 
   void TearDown() override {
     host_change_notification_listener_.reset();
     EXPECT_TRUE(signal_strategy_listeners_.empty());
   }
 
@@ skipping 77 matching lines @@
   std::unique_ptr<XmlElement> stanza =
       GetNotificationStanza("update", kHostId, kTestBotJid);
   host_change_notification_listener_->OnSignalStrategyIncomingStanza(
       stanza.get());
   message_loop_.task_runner()->PostTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
   base::RunLoop().Run();
 }
 
 }  // namespace remoting