| Index: remoting/signaling/fake_signal_strategy.cc
|
| diff --git a/remoting/signaling/fake_signal_strategy.cc b/remoting/signaling/fake_signal_strategy.cc
|
| index dc4db998fe85b27efd3d73a798d405409930bdaa..33f3242d317738beca724207397dcec2c9580817 100644
|
| --- a/remoting/signaling/fake_signal_strategy.cc
|
| +++ b/remoting/signaling/fake_signal_strategy.cc
|
| @@ -33,10 +33,11 @@ FakeSignalStrategy::FakeSignalStrategy(const SignalingAddress& address)
|
| address_(address),
|
| last_id_(0),
|
| weak_factory_(this) {
|
| - DetachFromThread();
|
| + DETACH_FROM_SEQUENCE(sequence_checker_);
|
| }
|
|
|
| FakeSignalStrategy::~FakeSignalStrategy() {
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| while (!received_messages_.empty()) {
|
| delete received_messages_.front();
|
| received_messages_.pop_front();
|
| @@ -60,23 +61,23 @@ void FakeSignalStrategy::ConnectTo(FakeSignalStrategy* peer) {
|
| }
|
|
|
| void FakeSignalStrategy::SetLocalAddress(const SignalingAddress& address) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| address_ = address;
|
| }
|
|
|
| void FakeSignalStrategy::SimulateMessageReordering() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| simulate_reorder_ = true;
|
| }
|
|
|
| void FakeSignalStrategy::Connect() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| for (auto& observer : listeners_)
|
| observer.OnSignalStrategyStateChange(CONNECTED);
|
| }
|
|
|
| void FakeSignalStrategy::Disconnect() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| for (auto& observer : listeners_)
|
| observer.OnSignalStrategyStateChange(DISCONNECTED);
|
| }
|
| @@ -90,22 +91,22 @@ SignalStrategy::Error FakeSignalStrategy::GetError() const {
|
| }
|
|
|
| const SignalingAddress& FakeSignalStrategy::GetLocalAddress() const {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| return address_;
|
| }
|
|
|
| void FakeSignalStrategy::AddListener(Listener* listener) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| listeners_.AddObserver(listener);
|
| }
|
|
|
| void FakeSignalStrategy::RemoveListener(Listener* listener) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| listeners_.RemoveObserver(listener);
|
| }
|
|
|
| bool FakeSignalStrategy::SendStanza(std::unique_ptr<buzz::XmlElement> stanza) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| address_.SetInMessage(stanza.get(), SignalingAddress::FROM);
|
|
|
| @@ -139,7 +140,7 @@ void FakeSignalStrategy::DeliverMessageOnThread(
|
|
|
| void FakeSignalStrategy::OnIncomingMessage(
|
| std::unique_ptr<buzz::XmlElement> stanza) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| if (!simulate_reorder_) {
|
| NotifyListeners(std::move(stanza));
|
| @@ -159,7 +160,7 @@ void FakeSignalStrategy::OnIncomingMessage(
|
|
|
| void FakeSignalStrategy::NotifyListeners(
|
| std::unique_ptr<buzz::XmlElement> stanza) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| buzz::XmlElement* stanza_ptr = stanza.get();
|
| received_messages_.push_back(stanza.release());
|
|
|