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

remoting/host/host_mock_objects.cc

 // Copyright (c) 2012 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/host_mock_objects.h"
 
 #include "base/message_loop_proxy.h"
 #include "net/base/ip_endpoint.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/base/capture_data.h"
@@ skipping 12 matching lines @@
 
 void MockCaptureCompletedCallback::CaptureCompleted(
     scoped_refptr<CaptureData> capture_data) {
   CaptureCompletedPtr(capture_data.get());
 }
 
 MockEventExecutor::MockEventExecutor() {}
 
 MockEventExecutor::~MockEventExecutor() {}
 
-void MockEventExecutor::Start(
+void MockEventExecutor::OnSessionStarted(
     scoped_ptr<protocol::ClipboardStub> client_clipboard) {
-  StartPtr(client_clipboard.get());
-}
-
-void MockEventExecutor::StopAndDelete() {
-  StopAndDeleteMock();
-  delete this;
+  OnSessionStartedPtr(client_clipboard.get());
 }
 
 MockDisconnectWindow::MockDisconnectWindow() {}
 
 MockDisconnectWindow::~MockDisconnectWindow() {}
 
 scoped_ptr<DisconnectWindow> DisconnectWindow::Create() {
   return scoped_ptr<DisconnectWindow>(new MockDisconnectWindow());
 }
 
@@ skipping 26 matching lines @@
 
 MockHostStatusObserver::MockHostStatusObserver() {}
 
 MockHostStatusObserver::~MockHostStatusObserver() {}
 
 MockUserAuthenticator::MockUserAuthenticator() {}
 
 MockUserAuthenticator::~MockUserAuthenticator() {}
 
 }  // namespace remoting