Switch remoting/protocol to 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"
@@ skipping 30 matching lines @@
 }
 
 ACTION(FinishEncode) {
   scoped_ptr<VideoPacket> packet(new VideoPacket());
   packet->set_flags(VideoPacket::LAST_PACKET | VideoPacket::LAST_PARTITION);
   arg2->Run(packet.release());
   delete arg2;
 }
 
 ACTION(FinishSend) {
-  arg1->Run();
-  delete arg1;
+  arg1.Run();
 }
 
 // Helper method to quit the main message loop.
 void QuitMessageLoop(MessageLoop* message_loop) {
   message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 
 ACTION_P2(StopScreenRecorder, recorder, task) {
   recorder->Stop(task);
 }
@@ skipping 61 matching lines @@
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
       .WillOnce(FinishEncode());
 
   MockVideoStub video_stub;
   EXPECT_CALL(*connection_, video_stub())
       .WillRepeatedly(Return(&video_stub));
 
   // Expect the client be notified.
   EXPECT_CALL(video_stub, ProcessVideoPacket(_, _))
       .Times(1)
-      .WillOnce(DoAll(DeleteArg<0>(), DeleteArg<1>()));
+      .WillOnce(DeleteArg<0>());
   EXPECT_CALL(video_stub, GetPendingPackets())
       .Times(AtLeast(0))
       .WillRepeatedly(Return(0));
 
   // Set the recording rate to very low to avoid capture twice.
   record_->SetMaxRate(0.01);
 
   // Add the mock client connection to the session.
   record_->AddConnection(connection_);
 
@@ skipping 52 matching lines @@
   record_->Start();
   message_loop_.Run();
 }
 
 TEST_F(ScreenRecorderTest, StopWithoutStart) {
   record_->Stop(base::Bind(&QuitMessageLoop, &message_loop_));
   message_loop_.Run();
 }
 
 }  // namespace remoting