Remove DCHECK from HeartbeatSender::OnSignallingDisconnected()

remoting/host/heartbeat_sender.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/host/heartbeat_sender.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
@@ skipping 63 matching lines @@
   request_.reset(signal_strategy->CreateIqRequest());
   request_->set_callback(NewCallback(this, &HeartbeatSender::ProcessResponse));
 
   DoSendStanza();
   timer_.Start(base::TimeDelta::FromMilliseconds(interval_ms_), this,
                &HeartbeatSender::DoSendStanza);
 }
 
 void HeartbeatSender::OnSignallingDisconnected() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
-  DCHECK_EQ(state_, STARTED);
-  state_ = STOPPED;
-  request_.reset(NULL);
+  if (state_ == STARTED) {
+    state_ = STOPPED;
+    request_.reset(NULL);

[Wez, 2011/07/06 22:45:15]

This change means that the heart-beat request only gets torn-down/cancelled if
the sender ever reached the STARTED state; why not tear it down regardless? 
Similarly, we're only setting the state to STOPPED iff it was previously
STARTED.

Why not just change the DCHECK on |state_| to test for INITIALIZED or STARTED
rather than just STARTED?

+  }
 }
 
 // Ignore any notifications other than signalling
 // connected/disconnected events.
 void HeartbeatSender::OnAccessDenied() { }
 void HeartbeatSender::OnAuthenticatedClientsChanged(int clients) { }
 void HeartbeatSender::OnShutdown() { }
 
 void HeartbeatSender::DoSendStanza() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
@@ skipping 66 matching lines @@
       QName(kChromotingXmlNamespace, kSignatureTimeAttr), time_str);
 
   std::string message = full_jid_ + ' ' + time_str;
   std::string signature(key_pair_.GetSignature(message));
   signature_tag->AddText(signature);
 
   return signature_tag;
 }
 
 }  // namespace remoting