Add InputEventTimestampSource interface.

remoting/protocol/ice_connection_to_client.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/ice_connection_to_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 74 matching lines @@
 std::unique_ptr<VideoStream> IceConnectionToClient::StartVideoStream(
     std::unique_ptr<webrtc::DesktopCapturer> desktop_capturer) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   std::unique_ptr<VideoEncoder> video_encoder =
       VideoEncoder::Create(session_->config());
 
   std::unique_ptr<VideoFramePump> pump(
       new VideoFramePump(video_encode_task_runner_, std::move(desktop_capturer),
                          std::move(video_encoder), video_dispatcher_.get()));
+  pump->SetEventTimestampsSource(event_dispatcher_->event_timestamps_source());
   video_dispatcher_->set_video_feedback_stub(pump->video_feedback_stub());
   return std::move(pump);
 }
 
 std::unique_ptr<AudioStream> IceConnectionToClient::StartAudioStream(
     std::unique_ptr<AudioSource> audio_source) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Audio channel is disabled.
   if (!audio_writer_)
@@ skipping 40 matching lines @@
     case Session::ACCEPTED:
       // Don't care about these events.
       break;
     case Session::AUTHENTICATING:
       event_handler_->OnConnectionAuthenticating();
       break;
     case Session::AUTHENTICATED:
       // Initialize channels.
       control_dispatcher_->Init(transport_.GetMultiplexedChannelFactory(),
                                 this);
-
       event_dispatcher_->Init(transport_.GetMultiplexedChannelFactory(), this);
-      event_dispatcher_->set_on_input_event_callback(
-          base::Bind(&IceConnectionToClient::OnInputEventReceived,
-                     base::Unretained(this)));
-
       video_dispatcher_->Init(transport_.GetChannelFactory(), this);
 
       audio_writer_ = AudioWriter::Create(session_->config());
       if (audio_writer_)
         audio_writer_->Init(transport_.GetMultiplexedChannelFactory(), this);
 
       // Notify the handler after initializing the channels, so that
       // ClientSession can get a client clipboard stub.
       event_handler_->OnConnectionAuthenticated();
       break;
@@ skipping 26 matching lines @@
 
   NotifyIfChannelsReady();
 }
 
 void IceConnectionToClient::OnChannelClosed(
     ChannelDispatcherBase* channel_dispatcher) {
   // ICE transport doesn't close channels dynamically.
   NOTREACHED();
 }
 
-void IceConnectionToClient::OnInputEventReceived(int64_t timestamp) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  event_handler_->OnInputEventReceived(timestamp);
-}
-
 void IceConnectionToClient::NotifyIfChannelsReady() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!control_dispatcher_ || !control_dispatcher_->is_connected())
     return;
   if (!event_dispatcher_ || !event_dispatcher_->is_connected())
     return;
   if (!video_dispatcher_ || !video_dispatcher_->is_connected())
     return;
   if ((!audio_writer_ || !audio_writer_->is_connected()) &&
       session_->config().is_audio_enabled()) {
     return;
   }
   event_handler_->OnConnectionChannelsConnected();
   event_handler_->CreateMediaStreams();
 }
 
 void IceConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   video_dispatcher_.reset();
   audio_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting