Move code in src/remoting to the new callbacks.

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::MockVideoStub;
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::DeleteArg;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::InvokeWithoutArgs;
-using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::SaveArg;
 
 namespace remoting {
 
 namespace {
 
 ACTION_P2(RunCallback, region, data) {
   SkRegion& dirty_region = data->mutable_dirty_region();
   dirty_region.op(region, SkRegion::kUnion_Op);
-  arg0->Run(data);
-  delete arg0;
+  arg0.Run(data);
 }
 
 ACTION(FinishEncode) {
   scoped_ptr<VideoPacket> packet(new VideoPacket());
   packet->set_flags(VideoPacket::LAST_PACKET | VideoPacket::LAST_PARTITION);
-  arg2->Run(packet.release());
-  delete arg2;
+  arg2.Run(packet.release());
 }
 
 ACTION(FinishSend) {
   arg1.Run();
 }
 
 // Helper method to quit the main message loop.
 void QuitMessageLoop(MessageLoop* message_loop) {
   message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
@@ skipping 54 matching lines @@
   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());
 
   // First the capturer is called.
-  EXPECT_CALL(capturer_, CaptureInvalidRegion(NotNull()))
+  EXPECT_CALL(capturer_, CaptureInvalidRegion(_))
       .WillRepeatedly(RunCallback(update_region, data));
 
   // Expect the encoder be called.
-  EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
+  EXPECT_CALL(*encoder_, Encode(data, false, _))
       .WillRepeatedly(FinishEncode());
 
   MockVideoStub video_stub;
   EXPECT_CALL(*connection_, video_stub())
       .WillRepeatedly(Return(&video_stub));
 
   // By default delete the arguments when ProcessVideoPacket is received.
   EXPECT_CALL(video_stub, ProcessVideoPacket(_, _))
       .WillRepeatedly(FinishSend());
 
@@ skipping 13 matching lines @@
   record_->Start();
   message_loop_.Run();
 }
 
 TEST_F(ScreenRecorderTest, StopWithoutStart) {
   record_->Stop(base::Bind(&QuitMessageLoop, &message_loop_));
   message_loop_.Run();
 }
 
 }  // namespace remoting