Revert "Fix crashes in ChromotingHost"

remoting/host/screen_recorder_unittest.cc

 // Copyright (c) 2010 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 "base/message_loop.h"
 #include "base/task.h"
 #include "remoting/base/mock_objects.h"
 #include "remoting/host/mock_objects.h"
 #include "remoting/host/screen_recorder.h"
 #include "remoting/proto/video.pb.h"
@@ skipping 58 matching lines @@
 static const VideoPacketFormat::Encoding kEncoding =
     VideoPacketFormat::ENCODING_VERBATIM;
 
 class ScreenRecorderTest : public testing::Test {
  public:
   ScreenRecorderTest() {
   }
 
   virtual void SetUp() {
     // Capturer and Encoder are owned by ScreenRecorder.
+    capturer_ = new MockCapturer();
     encoder_ = new MockEncoder();
     connection_ = new MockConnectionToClient();
     record_ = new ScreenRecorder(
         &message_loop_, &message_loop_, &message_loop_,
-        &capturer_, encoder_);
+        capturer_, encoder_);
   }
 
  protected:
   scoped_refptr<ScreenRecorder> record_;
   scoped_refptr<MockConnectionToClient> connection_;
 
   // The following mock objects are owned by ScreenRecorder.
-  MockCapturer capturer_;
+  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) {
   InvalidRects update_rects;
   update_rects.insert(gfx::Rect(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;
   }
   scoped_refptr<CaptureData> data(new CaptureData(planes, kWidth,
                                                   kHeight, kFormat));
-  EXPECT_CALL(capturer_, width()).WillRepeatedly(Return(kWidth));
-  EXPECT_CALL(capturer_, height()).WillRepeatedly(Return(kHeight));
+  EXPECT_CALL(*capturer_, width()).WillRepeatedly(Return(kWidth));
+  EXPECT_CALL(*capturer_, height()).WillRepeatedly(Return(kHeight));
 
   // First the capturer is called.
-  EXPECT_CALL(capturer_, CaptureInvalidRects(NotNull()))
+  EXPECT_CALL(*capturer_, CaptureInvalidRects(NotNull()))
       .WillOnce(RunCallback(update_rects, data));
 
   // Expect the encoder be called.
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
       .WillOnce(FinishEncode());
 
   MockVideoStub video_stub;
   EXPECT_CALL(*connection_, video_stub())
       .WillRepeatedly(Return(&video_stub));
 
@@ skipping 25 matching lines @@
 TEST_F(ScreenRecorderTest, StartAndStop) {
   InvalidRects update_rects;
   update_rects.insert(gfx::Rect(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;
   }
   scoped_refptr<CaptureData> data(new CaptureData(planes, kWidth,
                                                   kHeight, kFormat));
-  EXPECT_CALL(capturer_, width()).WillRepeatedly(Return(kWidth));
-  EXPECT_CALL(capturer_, height()).WillRepeatedly(Return(kHeight));
+  EXPECT_CALL(*capturer_, width()).WillRepeatedly(Return(kWidth));
+  EXPECT_CALL(*capturer_, height()).WillRepeatedly(Return(kHeight));
 
   // First the capturer is called.
-  EXPECT_CALL(capturer_, CaptureInvalidRects(NotNull()))
+  EXPECT_CALL(*capturer_, CaptureInvalidRects(NotNull()))
       .WillRepeatedly(RunCallback(update_rects, data));
 
   // Expect the encoder be called.
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
       .WillRepeatedly(FinishEncode());
 
   MockVideoStub video_stub;
   EXPECT_CALL(*connection_, video_stub())
       .WillRepeatedly(Return(&video_stub));
 
@@ skipping 16 matching lines @@
 
   // Start the recording.
   record_->Start();
   message_loop_.Run();
 }
 
 // TODO(hclam): Add test for double buffering.
 // TODO(hclam): Add test for multiple captures.
 
 }  // namespace remoting