Refactor SignalStrategy so that it can be reused for multiple connections.

remoting/jingle_glue/fake_signal_strategy.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 "remoting/jingle_glue/fake_signal_strategy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 16 matching lines @@
       last_id_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
 
 }
 
 FakeSignalStrategy::~FakeSignalStrategy() {
   while (!pending_messages_.empty()) {
     delete pending_messages_.front();
     pending_messages_.pop();
   }
-  DCHECK(listeners_.empty());
 }
 
-void FakeSignalStrategy::Init(StatusObserver* observer) {
-  observer->OnStateChange(StatusObserver::START);
-  observer->OnStateChange(StatusObserver::CONNECTING);
-  observer->OnJidChange(jid_);
-  observer->OnStateChange(StatusObserver::CONNECTED);
+void FakeSignalStrategy::Connect() {
+  DCHECK(CalledOnValidThread());
+  FOR_EACH_OBSERVER(Listener, listeners_,
+                    OnSignalStrategyStateChange(CONNECTED));
 }
 
-void FakeSignalStrategy::Close() {
+void FakeSignalStrategy::Disconnect() {
   DCHECK(CalledOnValidThread());
+  FOR_EACH_OBSERVER(Listener, listeners_,
+                    OnSignalStrategyStateChange(DISCONNECTED));
+}
+
+SignalStrategy::State FakeSignalStrategy::GetState() const {
+  return CONNECTED;
+}
+
+std::string FakeSignalStrategy::GetLocalJid() const {
+  DCHECK(CalledOnValidThread());
+  return jid_;
 }
 
 void FakeSignalStrategy::AddListener(Listener* listener) {
   DCHECK(CalledOnValidThread());
-  DCHECK(std::find(listeners_.begin(), listeners_.end(), listener) ==
-         listeners_.end());
-  listeners_.push_back(listener);
+  listeners_.AddObserver(listener);
 }
 
 void FakeSignalStrategy::RemoveListener(Listener* listener) {
   DCHECK(CalledOnValidThread());
-  std::vector<Listener*>::iterator it =
-      std::find(listeners_.begin(), listeners_.end(), listener);
-  CHECK(it != listeners_.end());
-  listeners_.erase(it);
+  listeners_.RemoveObserver(listener);
 }
 
 bool FakeSignalStrategy::SendStanza(buzz::XmlElement* stanza) {
   DCHECK(CalledOnValidThread());
 
   stanza->SetAttr(buzz::QN_FROM, jid_);
 
   if (peer_) {
     peer_->OnIncomingMessage(stanza);
     return true;
@@ skipping 19 matching lines @@
   while (!pending_messages_.empty()) {
     buzz::XmlElement* stanza = pending_messages_.front();
     const std::string& to_field = stanza->Attr(buzz::QN_TO);
     if (to_field != jid_) {
       LOG(WARNING) << "Dropping stanza that is addressed to " << to_field
                    << ". Local jid: " << jid_
                    << ". Message content: " << stanza->Str();
       return;
     }
 
-    for (std::vector<Listener*>::iterator it = listeners_.begin();
-         it != listeners_.end(); ++it) {
-      if ((*it)->OnIncomingStanza(stanza))
+    ObserverListBase<Listener>::Iterator it(listeners_);
+    Listener* listener;
+    while ((listener = it.GetNext()) != NULL) {
+      if (listener->OnSignalStrategyIncomingStanza(stanza))
         break;
     }
 
     pending_messages_.pop();
     delete stanza;
   }
 }
 
 }  // namespace remoting