diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 02:46:54 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 02:46:54 +0000 |
| commit | 71eb23d453937c320f1c7a3f46c1aae335df6269 (patch) | |
| tree | 6c13ed9a14c68b4bfda90c26fce9b03b1327c79d /remoting/host | |
| parent | 53d23fcc886d2a412cd8aaeb45c3c60f0586093c (diff) | |
| download | chromium_src-71eb23d453937c320f1c7a3f46c1aae335df6269.zip chromium_src-71eb23d453937c320f1c7a3f46c1aae335df6269.tar.gz chromium_src-71eb23d453937c320f1c7a3f46c1aae335df6269.tar.bz2 | |
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
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/heartbeat_sender.cc | 6 |
1 files changed, 2 insertions, 4 deletions
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); } |