Move code in src/remoting to the new callbacks.

remoting/base/encoder_row_based.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/base/encoder_row_based.h"
 
 #include "base/logging.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/base/compressor_verbatim.h"
 #include "remoting/base/compressor_zlib.h"
@@ skipping 38 matching lines @@
                                  VideoPacketFormat::Encoding encoding,
                                  int packet_size)
     : encoding_(encoding),
       compressor_(compressor),
       screen_size_(SkISize::Make(0,0)),
       packet_size_(packet_size) {
 }
 
 EncoderRowBased::~EncoderRowBased() {}
 
-void EncoderRowBased::Encode(scoped_refptr<CaptureData> capture_data,
-                             bool key_frame,
-                             DataAvailableCallback* data_available_callback) {
+void EncoderRowBased::Encode(
+    scoped_refptr<CaptureData> capture_data,
+    bool key_frame,
+    const DataAvailableCallback& data_available_callback) {
   CHECK(capture_data->pixel_format() == media::VideoFrame::RGB32)
       << "RowBased Encoder only works with RGB32. Got "
       << capture_data->pixel_format();
   capture_data_ = capture_data;
-  callback_.reset(data_available_callback);
+  callback_ = data_available_callback;
 
   const SkRegion& region = capture_data->dirty_region();
   SkRegion::Iterator iter(region);
   while (!iter.done()) {
     SkIRect rect = iter.rect();
     iter.next();
     EncodeRect(rect, iter.done());
   }
 
   capture_data_ = NULL;
-  callback_.reset();
+  callback_.Reset();
 }
 
 void EncoderRowBased::EncodeRect(const SkIRect& rect, bool last) {
   CHECK(capture_data_->data_planes().data[0]);
   const int strides = capture_data_->data_planes().strides[0];
   const int bytes_per_pixel = GetBytesPerPixel(capture_data_->pixel_format());
   const int row_size = bytes_per_pixel * rect.width();
 
   compressor_->Reset();
 
@@ skipping 36 matching lines @@
           capture_data_->client_sequence_number());
       if (last)
         packet->set_flags(packet->flags() | VideoPacket::LAST_PARTITION);
       DCHECK(row_pos == row_size);
       DCHECK(row_y == rect.height() - 1);
     }
 
     // If we have filled the message or we have reached the end of stream.
     if (filled == packet_size_ || !compress_again) {
       packet->mutable_data()->resize(filled);
-      callback_->Run(packet);
+      callback_.Run(packet);
       packet = NULL;
     }
 
     // Reached the end of input row and we're not at the last row.
     if (row_pos == row_size && row_y < rect.height() - 1) {
       row_pos = 0;
       in += strides;
       ++row_y;
     }
   }
@@ skipping 18 matching lines @@
 
 uint8* EncoderRowBased::GetOutputBuffer(VideoPacket* packet, size_t size) {
   packet->mutable_data()->resize(size);
   // TODO(ajwong): Is there a better way to do this at all???
   return const_cast<uint8*>(reinterpret_cast<const uint8*>(
       packet->mutable_data()->data()));
 }
 
 
 }  // namespace remoting