Replace VideoStream::SizeCallback with VideoStream::Observer interface.

remoting/protocol/webrtc_video_stream.cc

 // Copyright 2015 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/protocol/webrtc_video_stream.h"
 
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 148 matching lines @@
 }
 
 void WebrtcVideoStream::SetLosslessEncode(bool want_lossless) {
   NOTIMPLEMENTED();
 }
 
 void WebrtcVideoStream::SetLosslessColor(bool want_lossless) {
   NOTIMPLEMENTED();
 }
 
-void WebrtcVideoStream::SetSizeCallback(const SizeCallback& size_callback) {
+void WebrtcVideoStream::SetObserver(Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  size_callback_ = size_callback;
+  observer_ = observer;
 }
 
 void WebrtcVideoStream::SetKeyFrameRequest() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   key_frame_request_ = true;
   if (!received_first_frame_request_) {
     received_first_frame_request_ = true;
     StartCaptureTimer();
     main_task_runner_->PostTask(
@@ skipping 41 matching lines @@
 
   // TODO(sergeyu): Handle ERROR_PERMANENT result here.
 
   webrtc::DesktopVector dpi =
       frame->dpi().is_zero() ? webrtc::DesktopVector(kDefaultDpi, kDefaultDpi)
                              : frame->dpi();
 
   if (!frame_size_.equals(frame->size()) || !frame_dpi_.equals(dpi)) {
     frame_size_ = frame->size();
     frame_dpi_ = dpi;
-    if (!size_callback_.is_null())
-      size_callback_.Run(frame_size_, frame_dpi_);
+    if (observer_)
+      observer_->OnVideoSizeChanged(this, frame_size_, frame_dpi_);
   }
   encode_pending_ = true;
   base::PostTaskAndReplyWithResult(
       encode_task_runner_.get(), FROM_HERE,
       base::Bind(&EncodeFrame, encoder_.get(), base::Passed(std::move(frame)),
                  target_bitrate_kbps_, ClearAndGetKeyFrameRequest(),
                  capture_timestamp_ms),
       base::Bind(&WebrtcVideoStream::OnFrameEncoded,
                  weak_factory_.GetWeakPtr()));
 }
@@ skipping 34 matching lines @@
   } else {
     LOG(ERROR) << "SendEncodedFrame() failed";
   }
   capture_timer_->Start(FROM_HERE,
                         base::TimeDelta::FromMilliseconds(next_sched_ms), this,
                         &WebrtcVideoStream::CaptureNextFrame);
 }
 
 }  // namespace protocol
 }  // namespace remoting