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

remoting/host/screen_recorder_unittest.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/screen_recorder.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/codec/video_encoder.h"
@@ skipping 82 matching lines @@
   }
 
   virtual void SetUp() OVERRIDE {
     // VideoFrameCapturer and VideoEncoder are owned by ScreenRecorder.
     encoder_ = new MockVideoEncoder();
 
     session_ = new MockSession();
     EXPECT_CALL(*session_, SetEventHandler(_));
     EXPECT_CALL(*session_, Close())
         .Times(AnyNumber());
-    connection_.reset(new MockConnectionToClient(session_, &host_stub_));
+    connection_.reset(new MockConnectionToClient(
+        session_, &host_stub_, &event_executor_));
     connection_->SetEventHandler(&handler_);
 
     record_ = new ScreenRecorder(
         message_loop_.message_loop_proxy(), message_loop_.message_loop_proxy(),
         message_loop_.message_loop_proxy(), &capturer_, encoder_);
   }
 
   virtual void TearDown() OVERRIDE {
     connection_.reset();
     // Run message loop before destroying because protocol::Session is
     // destroyed asynchronously.
     message_loop_.RunAllPending();
   }
 
  protected:
   MessageLoop message_loop_;
   scoped_refptr<ScreenRecorder> record_;
 
   MockConnectionToClientEventHandler handler_;
   MockHostStub host_stub_;
+  MockEventExecutor event_executor_;
   MockSession* session_;  // Owned by |connection_|.
   scoped_ptr<MockConnectionToClient> connection_;
 
   // The following mock objects are owned by ScreenRecorder.
   MockVideoFrameCapturer capturer_;
   MockVideoEncoder* encoder_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenRecorderTest);
 };
@@ skipping 57 matching lines @@
   message_loop_.Run();
 }
 
 TEST_F(ScreenRecorderTest, StopWithoutStart) {
   EXPECT_CALL(capturer_, Stop());
   record_->Stop(base::Bind(&QuitMessageLoop, &message_loop_));
   message_loop_.Run();
 }
 
 }  // namespace remoting