Move VideoFramePump to remoting/protocol

remoting/protocol/capture_scheduler.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef REMOTING_HOST_CAPTURE_SCHEDULER_H_
-#define REMOTING_HOST_CAPTURE_SCHEDULER_H_
+#ifndef REMOTING_PROTOCOL_CAPTURE_SCHEDULER_H_
+#define REMOTING_PROTOCOL_CAPTURE_SCHEDULER_H_
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "remoting/base/running_average.h"
 #include "remoting/protocol/video_feedback_stub.h"
 
 namespace remoting {
 
 class VideoPacket;
 
+namespace protocol {
+
 // CaptureScheduler is used by the VideoFramePump to schedule frame capturer,
 // taking into account capture delay, encoder delay, network bandwidth, etc.
 // It implements VideoFeedbackStub to receive frame acknowledgments from the
 // client.
 //
 // It attempts to achieve the following goals when scheduling frames:
 //  - Keep round-trip latency as low a possible.
 //  - Parallelize capture, encode and transmission, to achieve frame rate as
 //    close to the target of 30fps as possible.
 //  - Limit CPU usage to 50%.
-class CaptureScheduler : public protocol::VideoFeedbackStub {
+class CaptureScheduler : public VideoFeedbackStub {
  public:
   explicit CaptureScheduler(const base::Closure& capture_closure);
   ~CaptureScheduler() override;
 
   // Starts the scheduler.
   void Start();
 
   // Pauses or unpauses the stream.
   void Pause(bool pause);
 
@@ skipping 60 matching lines @@
   bool is_paused_;
 
   // Frame ID to be assigned to the next outgoing video frame.
   uint32_t next_frame_id_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptureScheduler);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_CAPTURE_SCHEDULER_H_
+#endif  // REMOTING_PROTOCOL_CAPTURE_SCHEDULER_H_