| Index: remoting/codec/codec_test.cc
|
| diff --git a/remoting/codec/codec_test.cc b/remoting/codec/codec_test.cc
|
| index eff143d1c6e1dca9d1fc8c926ccf023eb0b84997..651a2dc04ed56c54d359ece700dd516aa82a4354 100644
|
| --- a/remoting/codec/codec_test.cc
|
| +++ b/remoting/codec/codec_test.cc
|
| @@ -358,8 +358,8 @@ static void TestEncodingRects(VideoEncoder* encoder,
|
| }
|
| tester->AddRects(rects, count);
|
|
|
| - encoder->Encode(frame, base::Bind(
|
| - &VideoEncoderTester::DataAvailable, base::Unretained(tester)));
|
| + scoped_ptr<VideoPacket> packet = encoder->Encode(*frame);
|
| + tester->DataAvailable(packet.Pass());
|
| }
|
|
|
| void TestVideoEncoder(VideoEncoder* encoder, bool strict) {
|
| @@ -412,8 +412,8 @@ static void TestEncodeDecodeRects(VideoEncoder* encoder,
|
| }
|
| }
|
|
|
| - encoder->Encode(frame, base::Bind(&VideoEncoderTester::DataAvailable,
|
| - base::Unretained(encoder_tester)));
|
| + scoped_ptr<VideoPacket> packet = encoder->Encode(*frame);
|
| + encoder_tester->DataAvailable(packet.Pass());
|
| decoder_tester->VerifyResults();
|
| decoder_tester->Reset();
|
| }
|
| @@ -475,9 +475,8 @@ void TestVideoEncoderDecoderGradient(VideoEncoder* encoder,
|
| decoder_tester.set_frame(frame.get());
|
| decoder_tester.AddRegion(frame->updated_region());
|
|
|
| - encoder->Encode(frame.get(),
|
| - base::Bind(&VideoDecoderTester::ReceivedScopedPacket,
|
| - base::Unretained(&decoder_tester)));
|
| + scoped_ptr<VideoPacket> packet = encoder->Encode(*frame);
|
| + decoder_tester.ReceivedScopedPacket(packet.Pass());
|
|
|
| decoder_tester.VerifyResultsApprox(expected_result->data(),
|
| max_error_limit, mean_error_limit);
|
|
|