Fix crashes in ChromotingHost

remoting/host/screen_recorder_unittest.cc

Index: remoting/host/screen_recorder_unittest.cc
diff --git a/remoting/host/screen_recorder_unittest.cc b/remoting/host/screen_recorder_unittest.cc
index 77a90b789e9e7b01e5036517aaa2849d4cdd7807..7b1fbca4fcf22ce5cd9226a9495e2c69239d79a4 100644
--- a/remoting/host/screen_recorder_unittest.cc
+++ b/remoting/host/screen_recorder_unittest.cc
@@ -76,12 +76,11 @@ class ScreenRecorderTest : public testing::Test {
 
   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:
@@ -89,7 +88,7 @@ class ScreenRecorderTest : public testing::Test {
   scoped_refptr<MockConnectionToClient> connection_;
 
   // The following mock objects are owned by ScreenRecorder.
-  MockCapturer* capturer_;
+  MockCapturer capturer_;
   MockEncoder* encoder_;
   MessageLoop message_loop_;
  private:
@@ -106,11 +105,11 @@ TEST_F(ScreenRecorderTest, OneRecordCycle) {
   }
   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.
@@ -152,11 +151,11 @@ TEST_F(ScreenRecorderTest, StartAndStop) {
   }
   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.