Move ConnectionToClient::EventHandler from ChromotingHost to ClientSession

remoting/host/screen_recorder_unittest.cc

 // Copyright (c) 2011 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 "base/task.h"
 #include "remoting/base/base_mock_objects.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::remoting::protocol::MockConnectionToClient;
 using ::remoting::protocol::MockConnectionToClientEventHandler;
 using ::remoting::protocol::MockHostStub;
+using ::remoting::protocol::MockSession;
 using ::remoting::protocol::MockVideoStub;
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::DeleteArg;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::InvokeWithoutArgs;
 using ::testing::NotNull;
 using ::testing::Return;
@@ skipping 40 matching lines @@
 
 class ScreenRecorderTest : public testing::Test {
  public:
   ScreenRecorderTest() {
   }
 
   virtual void SetUp() {
     // Capturer and Encoder are owned by ScreenRecorder.
     encoder_ = new MockEncoder();
 
+    session_ = new MockSession();
+    EXPECT_CALL(*session_, SetStateChangeCallback(_));
     connection_ = new MockConnectionToClient(
-        &handler_, &host_stub_, &event_executor_);
+        session_, &host_stub_, &event_executor_);
+    connection_->SetEventHandler(&handler_);
 
     record_ = new ScreenRecorder(
         &message_loop_, &message_loop_,
         base::MessageLoopProxy::current(),
         &capturer_, encoder_);
   }
 
  protected:
   scoped_refptr<ScreenRecorder> record_;
 
   MockConnectionToClientEventHandler handler_;
   MockHostStub host_stub_;
   MockEventExecutor event_executor_;
+  MockSession* session_;  // Owned by |connection_|.
   scoped_refptr<MockConnectionToClient> connection_;
 
   // The following mock objects are owned by ScreenRecorder.
   MockCapturer capturer_;
   MockEncoder* encoder_;
   MessageLoop message_loop_;
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenRecorderTest);
 };
 
 // This test mocks capturer, encoder and network layer to operate one recording
 // cycle.
 TEST_F(ScreenRecorderTest, OneRecordCycle) {

[Wez, 2011/11/09 23:34:50]

Did you mean to remove this?

[Sergey Ulanov, 2011/11/10 00:55:57]

Alpha removed it (http://codereview.chromium.org/8342040 ), not sure why. I just
synced his change.

   SkRegion update_region(SkIRect::MakeXYWH(0, 0, 10, 10));
   DataPlanes planes;
   for (int i = 0; i < DataPlanes::kPlaneCount; ++i) {
     planes.data[i] = reinterpret_cast<uint8*>(i);
     planes.strides[i] = kWidth * 4;
   }
   SkISize size(SkISize::Make(kWidth, kHeight));
   scoped_refptr<CaptureData> data(new CaptureData(planes, size, kFormat));
   EXPECT_CALL(capturer_, InvalidateFullScreen());
 
@@ skipping 78 matching lines @@
   record_->Start();
   message_loop_.Run();
 }
 
 TEST_F(ScreenRecorderTest, StopWithoutStart) {
   record_->Stop(base::Bind(&QuitMessageLoop, &message_loop_));
   message_loop_.Run();
 }
 
 }  // namespace remoting