| Index: remoting/host/daemon_process_win.cc
|
| diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
|
| index e3f2b4d410da04a8b4b5a5235c5b0a9cacdaef8b..5d2dc9464b5b21d007f618cf1b276fb5e7d93d0a 100644
|
| --- a/remoting/host/daemon_process_win.cc
|
| +++ b/remoting/host/daemon_process_win.cc
|
| @@ -60,9 +60,6 @@ class DaemonProcessWin : public DaemonProcess {
|
| IPC::PlatformFileForTransit desktop_pipe) OVERRIDE;
|
|
|
| protected:
|
| - // Stoppable implementation.
|
| - virtual void DoStop() OVERRIDE;
|
| -
|
| // DaemonProcess implementation.
|
| virtual scoped_ptr<DesktopSession> DoCreateDesktopSession(
|
| int terminal_id,
|
| @@ -89,10 +86,6 @@ DaemonProcessWin::DaemonProcessWin(
|
| }
|
|
|
| DaemonProcessWin::~DaemonProcessWin() {
|
| - // Make sure that the object is completely stopped. The same check exists
|
| - // in Stoppable::~Stoppable() but this one helps us to fail early and
|
| - // predictably.
|
| - CHECK_EQ(stoppable_state(), Stoppable::kStopped);
|
| }
|
|
|
| void DaemonProcessWin::OnChannelConnected(int32 peer_pid) {
|
| @@ -138,13 +131,6 @@ bool DaemonProcessWin::OnDesktopSessionAgentAttached(
|
| return true;
|
| }
|
|
|
| -void DaemonProcessWin::DoStop() {
|
| - DCHECK(caller_task_runner()->BelongsToCurrentThread());
|
| -
|
| - network_launcher_.reset();
|
| - DaemonProcess::DoStop();
|
| -}
|
| -
|
| scoped_ptr<DesktopSession> DaemonProcessWin::DoCreateDesktopSession(
|
| int terminal_id,
|
| const ScreenResolution& resolution,
|
|
|