Revert 155219 - [Chromoting] Refactoring DesktopEnvironment and moving screen/audio recorders to Cl…

remoting/host/event_executor_mac.cc

Index: remoting/host/event_executor_mac.cc
===================================================================
--- remoting/host/event_executor_mac.cc	(revision 155274)
+++ remoting/host/event_executor_mac.cc	(working copy)
@@ -57,9 +57,9 @@
   virtual void InjectMouseEvent(const MouseEvent& event) OVERRIDE;
 
   // EventExecutor interface.
-  virtual void Start(
+  virtual void OnSessionStarted(
       scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
-  virtual void StopAndDelete() OVERRIDE;
+  virtual void OnSessionFinished() OVERRIDE;
 
  private:
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
@@ -404,12 +404,12 @@
   }
 }
 
-void EventExecutorMac::Start(
+void EventExecutorMac::OnSessionStarted(
     scoped_ptr<protocol::ClipboardStub> client_clipboard) {
   if (!task_runner_->BelongsToCurrentThread()) {
     task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(&EventExecutorMac::Start,
+        base::Bind(&EventExecutorMac::OnSessionStarted,
                    base::Unretained(this),
                    base::Passed(&client_clipboard)));
     return;
@@ -418,17 +418,16 @@
   clipboard_->Start(client_clipboard.Pass());
 }
 
-void EventExecutorMac::StopAndDelete() {
+void EventExecutorMac::OnSessionFinished() {
   if (!task_runner_->BelongsToCurrentThread()) {
     task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(&EventExecutorMac::StopAndDelete,
+        base::Bind(&EventExecutorMac::OnSessionFinished,
                    base::Unretained(this)));
     return;
   }
 
   clipboard_->Stop();
-  delete this;
 }
 
 }  // namespace