Simplify VideoEncoder interface.

remoting/codec/codec_test.cc

 // Copyright (c) 2012 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 <deque>
 #include <stdlib.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 340 matching lines @@
                               VideoEncoderTester* tester,
                               webrtc::DesktopFrame* frame,
                               const DesktopRect* rects,
                               int count) {
   frame->mutable_updated_region()->Clear();
   for (int i = 0; i < count; ++i) {
     frame->mutable_updated_region()->AddRect(rects[i]);
   }
   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) {
   const int kSizes[] = {320, 319, 317, 150};
 
   VideoEncoderMessageTester message_tester;
   message_tester.set_strict(strict);
 
   VideoEncoderTester tester(&message_tester);
 
@@ skipping 32 matching lines @@
     uint8* memory = frame->data() +
       frame->stride() * rects[i].top() +
       webrtc::DesktopFrame::kBytesPerPixel * rects[i].left();
     for (int y = 0; y < rects[i].height(); ++y) {
       for (int x = 0; x < row_size; ++x)
         memory[x] = rand() % 256;
       memory += frame->stride();
     }
   }
 
-  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();
 }
 
 void TestVideoEncoderDecoder(
     VideoEncoder* encoder, VideoDecoder* decoder, bool strict) {
   DesktopSize kSize = DesktopSize(320, 240);
 
   VideoEncoderMessageTester message_tester;
   message_tester.set_strict(strict);
@@ skipping 41 matching lines @@
   frame->mutable_updated_region()->SetRect(DesktopRect::MakeSize(screen_size));
 
   scoped_ptr<webrtc::BasicDesktopFrame> expected_result(
       new webrtc::BasicDesktopFrame(view_size));
   FillWithGradient(expected_result.get());
 
   VideoDecoderTester decoder_tester(decoder, screen_size, view_size);
   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);
 
   // Check that the decoder correctly re-renders the frame if its client
   // invalidates the frame.
   decoder_tester.ResetRenderedData();
   decoder->Invalidate(
       SkISize::Make(view_size.width(), view_size.height()),
       SkRegion(SkIRect::MakeWH(view_size.width(), view_size.height())));
   decoder_tester.RenderFrame();
   decoder_tester.VerifyResultsApprox(expected_result->data(),
                                      max_error_limit, mean_error_limit);
 }
 
 }  // namespace remoting