Convert CastRtpStream::ErrorCallback to base::RepeatingCallback

Bug: 1007641
Change-Id: I9b02fb01862b99d5f8fbf7bc0bf3fd75bf659c0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2105755Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760963}

chrome/renderer/extensions/cast_streaming_native_handler.cc

@@ -590,9 +590,8 @@ void CastStreamingNativeHandler::StartCastRtpStream(
       base::BindOnce(&CastStreamingNativeHandler::CallStopCallback,
                      weak_factory_.GetWeakPtr(), transport_id);
   CastRtpStream::ErrorCallback error_callback =
-      base::Bind(&CastStreamingNativeHandler::CallErrorCallback,
-                 weak_factory_.GetWeakPtr(),
-                 transport_id);
+      base::BindRepeating(&CastStreamingNativeHandler::CallErrorCallback,
+                          weak_factory_.GetWeakPtr(), transport_id);
 
   // |transport_id| is a globally unique identifier for the RTP stream.
   transport->Start(transport_id, config, std::move(start_callback),

chrome/renderer/media/cast_rtp_stream.cc

@@ -170,9 +170,9 @@ class CastVideoSink : public base::SupportsWeakPtr<CastVideoSink>,
   // |track| provides data for this sink.
   // |error_callback| is called if video formats don't match.
   CastVideoSink(const blink::WebMediaStreamTrack& track,
-                const CastRtpStream::ErrorCallback& error_callback)
+                CastRtpStream::ErrorCallback error_callback)
       : track_(track),
-        deliverer_(new Deliverer(error_callback)),
+        deliverer_(base::MakeRefCounted<Deliverer>(std::move(error_callback))),
         consecutive_refresh_count_(0),
         expecting_a_refresh_frame_(false),
         is_connected_to_track_(false) {}
@@ -203,9 +203,9 @@ class CastVideoSink : public base::SupportsWeakPtr<CastVideoSink>,
  private:
   class Deliverer : public base::RefCountedThreadSafe<Deliverer> {
    public:
-    explicit Deliverer(const CastRtpStream::ErrorCallback& error_callback)
+    explicit Deliverer(CastRtpStream::ErrorCallback error_callback)
         : main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
-          error_callback_(error_callback) {}
+          error_callback_(std::move(error_callback)) {}
 
     void WillConnectToTrack(
         base::WeakPtr<CastVideoSink> sink,
@@ -495,14 +495,14 @@ void CastRtpStream::Start(int32_t stream_id,
                           const FrameSenderConfig& config,
                           base::OnceClosure start_callback,
                           base::OnceClosure stop_callback,
-                          const ErrorCallback& error_callback) {
+                          ErrorCallback error_callback) {
   DCHECK(!start_callback.is_null());
   DCHECK(!stop_callback.is_null());
   DCHECK(!error_callback.is_null());
 
   DVLOG(1) << "CastRtpStream::Start = " << (is_audio_ ? "audio" : "video");
   stop_callback_ = std::move(stop_callback);
-  error_callback_ = error_callback;
+  error_callback_ = std::move(error_callback);
 
   if (track_.IsNull()) {
     cast_session_->StartRemotingStream(

chrome/renderer/media/cast_rtp_stream.h

@@ -33,7 +33,7 @@ class CastVideoSink;
 // stream.
 class CastRtpStream {
  public:
-  typedef base::Callback<void(const std::string&)> ErrorCallback;
+  using ErrorCallback = base::RepeatingCallback<void(const std::string&)>;
 
   static bool IsHardwareVP8EncodingSupported();
 
@@ -57,7 +57,7 @@ class CastRtpStream {
              const media::cast::FrameSenderConfig& config,
              base::OnceClosure start_callback,
              base::OnceClosure stop_callback,
-             const ErrorCallback& error_callback);
+             ErrorCallback error_callback);
 
   // Stop encoding.
   void Stop();