Move VideoFramePump to remoting/protocol

remoting/host/client_session.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 "remoting/host/client_session.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "remoting/base/capabilities.h"
 #include "remoting/base/logging.h"
 #include "remoting/codec/audio_encoder.h"
 #include "remoting/codec/audio_encoder_opus.h"
 #include "remoting/codec/audio_encoder_verbatim.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/codec/video_encoder_verbatim.h"
 #include "remoting/codec/video_encoder_vpx.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/audio_pump.h"
 #include "remoting/host/desktop_capturer_proxy.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_extension_session.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/mouse_shape_pump.h"
 #include "remoting/host/screen_controls.h"
 #include "remoting/host/screen_resolution.h"
-#include "remoting/host/video_frame_pump.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_thread_proxy.h"
 #include "remoting/protocol/pairing_registry.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
+#include "remoting/protocol/video_frame_pump.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
 
 // Default DPI to assume for old clients that use notifyClientDimensions.
 const int kDefaultDPI = 96;
 
 namespace remoting {
 
 namespace {
 
@@ skipping 433 matching lines @@
       new MouseShapePump(video_capture_task_runner_,
                          desktop_environment_->CreateMouseCursorMonitor(),
                          connection_->client_stub()));
 
   // Create a VideoFramePump to pump frames from the capturer to the client.'
   //
   // TODO(sergeyu): Move DesktopCapturerProxy creation to DesktopEnvironment.
   // When using IpcDesktopCapturer the capture thread is not useful.
   scoped_ptr<DesktopCapturerProxy> capturer_proxy(new DesktopCapturerProxy(
       video_capture_task_runner_, video_capturer.Pass()));
-  video_frame_pump_.reset(
-      new VideoFramePump(video_encode_task_runner_, capturer_proxy.Pass(),
-                         video_encoder.Pass(), &mouse_clamping_filter_));
+  video_frame_pump_.reset(new protocol::VideoFramePump(
+      video_encode_task_runner_, capturer_proxy.Pass(), video_encoder.Pass(),
+      &mouse_clamping_filter_));
 
   // Apply video-control parameters to the new scheduler.
   video_frame_pump_->SetLosslessEncode(lossless_video_encode_);
   video_frame_pump_->SetLosslessColor(lossless_video_color_);
 
   // Pause capturing if necessary.
   video_frame_pump_->Pause(pause_video_);
 
   connection_->set_video_feedback_stub(
       video_frame_pump_->video_feedback_stub());
 }
 
 void ClientSession::SetGnubbyAuthHandlerForTesting(
     GnubbyAuthHandler* gnubby_auth_handler) {
   DCHECK(CalledOnValidThread());
   gnubby_auth_handler_.reset(gnubby_auth_handler);
 }
 
 scoped_ptr<protocol::ClipboardStub> ClientSession::CreateClipboardProxy() {
   DCHECK(CalledOnValidThread());
 
   return make_scoped_ptr(
       new protocol::ClipboardThreadProxy(client_clipboard_factory_.GetWeakPtr(),
                                          base::ThreadTaskRunnerHandle::Get()));
 }
 
 }  // namespace remoting