From 71eb23d453937c320f1c7a3f46c1aae335df6269 Mon Sep 17 00:00:00 2001 From: "glen@chromium.org" Date: Tue, 10 Aug 2010 02:46:54 +0000 Subject: Revert 55507 - Start chromoting host in the service process though a method call This change exposes method calls to configure the chromoting host and allow it to be started from a method. This will allow us to use IPC message to start the chromoting host. TEST=unit_tests --gtest_filter=ServiceProcess* BUG=50243, 50244 Review URL: http://codereview.chromium.org/3084024 TBR=hclam@chromium.org Review URL: http://codereview.chromium.org/3110004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55525 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/host/heartbeat_sender.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'remoting/host') diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc index e6a78f7..b62b268a 100644 --- a/remoting/host/heartbeat_sender.cc +++ b/remoting/host/heartbeat_sender.cc @@ -65,7 +65,7 @@ void HeartbeatSender::Start() { return; } - DCHECK_EQ(INITIALIZED, state_); + DCHECK(state_ == INITIALIZED); state_ = STARTED; request_.reset(jingle_client_->CreateIqRequest()); @@ -82,9 +82,7 @@ void HeartbeatSender::Stop() { return; } - // We may call Stop() even if we have not started. - if (state_ != STARTED) - return; + DCHECK(state_ == STARTED); state_ = STOPPED; request_.reset(NULL); } -- cgit v1.1