Move protocol classes to the remoting::protocol namespace

BUG=None
TEST=compiles

Review URL: http://codereview.chromium.org/4233005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65006 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 49 insertions, 11 deletions

diff --git a/remoting/protocol/buffered_socket_writer.cc b/remoting/protocol/buffered_socket_writer.cc
index 0650cbe..1931cd5 100644
--- a/remoting/protocol/buffered_socket_writer.cc
+++ b/remoting/protocol/buffered_socket_writer.cc
@@ -8,6 +8,7 @@
 #include "net/base/net_errors.h"
 
 namespace remoting {
+namespace protocol {
 
 BufferedSocketWriterBase::BufferedSocketWriterBase()
     : buffer_size_(0),
@@ -164,4 +165,5 @@ void BufferedDatagramWriter::AdvanceBufferPosition_Locked(int written) {
 }
 
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/buffered_socket_writer.h b/remoting/protocol/buffered_socket_writer.h
index dd1cde8..04e41b6 100644
--- a/remoting/protocol/buffered_socket_writer.h
+++ b/remoting/protocol/buffered_socket_writer.h
@@ -19,6 +19,7 @@ class Socket;
 }  // namespace net
 
 namespace remoting {
+namespace protocol {
 
 // BufferedSocketWriter and BufferedDatagramWriter implement write data queue
 // for stream and datagram sockets. BufferedSocketWriterBase is a base class
@@ -109,6 +110,7 @@ class BufferedDatagramWriter : public BufferedSocketWriterBase {
   virtual void AdvanceBufferPosition_Locked(int written);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_BUFFERED_SOCKET_WRITER_H_
diff --git a/remoting/protocol/protobuf_video_reader.cc b/remoting/protocol/protobuf_video_reader.cc
index e809bd9..f777363 100644
--- a/remoting/protocol/protobuf_video_reader.cc
+++ b/remoting/protocol/protobuf_video_reader.cc
@@ -8,6 +8,7 @@
 #include "remoting/protocol/session.h"
 
 namespace remoting {
+namespace protocol {
 
 ProtobufVideoReader::ProtobufVideoReader() { }
 ProtobufVideoReader::~ProtobufVideoReader() { }
@@ -27,4 +28,5 @@ void ProtobufVideoReader::OnNewData(VideoPacket* packet) {
   video_stub_->ProcessVideoPacket(packet, new DeleteTask<VideoPacket>(packet));
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/protobuf_video_reader.h b/remoting/protocol/protobuf_video_reader.h
index fab8f44..669cd0b 100644
--- a/remoting/protocol/protobuf_video_reader.h
+++ b/remoting/protocol/protobuf_video_reader.h
@@ -9,10 +9,9 @@
 #include "remoting/protocol/video_reader.h"
 
 namespace remoting {
-
 namespace protocol {
+
 class Session;
-}  // namespace protocol
 
 class ProtobufVideoReader : public VideoReader {
  public:
@@ -34,6 +33,7 @@ class ProtobufVideoReader : public VideoReader {
   DISALLOW_COPY_AND_ASSIGN(ProtobufVideoReader);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PROTOBUF_VIDEO_READER_H_
diff --git a/remoting/protocol/protobuf_video_writer.cc b/remoting/protocol/protobuf_video_writer.cc
index b4d6999..9bbd88b 100644
--- a/remoting/protocol/protobuf_video_writer.cc
+++ b/remoting/protocol/protobuf_video_writer.cc
@@ -9,6 +9,7 @@
 #include "remoting/protocol/util.h"
 
 namespace remoting {
+namespace protocol {
 
 ProtobufVideoWriter::ProtobufVideoWriter() { }
 
@@ -33,4 +34,5 @@ void ProtobufVideoWriter::Close() {
   buffered_writer_->Close();
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/protobuf_video_writer.h b/remoting/protocol/protobuf_video_writer.h
index c1ba183..ba02584 100644
--- a/remoting/protocol/protobuf_video_writer.h
+++ b/remoting/protocol/protobuf_video_writer.h
@@ -9,12 +9,10 @@
 #include "remoting/protocol/video_writer.h"
 
 namespace remoting {
-
 namespace protocol {
-class Session;
-}  // namespace protocol
 
 class BufferedSocketWriter;
+class Session;
 
 class ProtobufVideoWriter : public VideoWriter {
  public:
@@ -33,6 +31,7 @@ class ProtobufVideoWriter : public VideoWriter {
   DISALLOW_COPY_AND_ASSIGN(ProtobufVideoWriter);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PROTOBUF_VIDEO_WRITER_H_
diff --git a/remoting/protocol/rtp_reader.cc b/remoting/protocol/rtp_reader.cc
index 31b133e..9609a6d 100644
--- a/remoting/protocol/rtp_reader.cc
+++ b/remoting/protocol/rtp_reader.cc
@@ -8,6 +8,7 @@
 #include "net/base/io_buffer.h"
 
 namespace remoting {
+namespace protocol {
 
 RtpPacket::RtpPacket() {}
 RtpPacket::~RtpPacket() {}
@@ -37,4 +38,5 @@ void RtpReader::OnDataReceived(net::IOBuffer* buffer, int data_size) {
   on_message_callback_->Run(packet);
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/rtp_reader.h b/remoting/protocol/rtp_reader.h
index 3fc3983..c159f8d 100644
--- a/remoting/protocol/rtp_reader.h
+++ b/remoting/protocol/rtp_reader.h
@@ -10,6 +10,7 @@
 #include "remoting/protocol/socket_reader_base.h"
 
 namespace remoting {
+namespace protocol {
 
 struct RtpPacket {
   RtpPacket();
@@ -45,6 +46,7 @@ class RtpReader : public SocketReaderBase {
   DISALLOW_COPY_AND_ASSIGN(RtpReader);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 
diff --git a/remoting/protocol/rtp_utils.cc b/remoting/protocol/rtp_utils.cc
index 25cbefc..1337795 100644
--- a/remoting/protocol/rtp_utils.cc
+++ b/remoting/protocol/rtp_utils.cc
@@ -13,6 +13,7 @@ using talk_base::SetBE16;
 using talk_base::SetBE32;
 
 namespace remoting {
+namespace protocol {
 
 namespace {
 const int kRtpBaseHeaderSize = 12;
@@ -84,4 +85,5 @@ int UnpackRtpHeader(const uint8* buffer, int buffer_size, RtpHeader* header) {
   return GetRtpHeaderSize(header->sources);
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/rtp_utils.h b/remoting/protocol/rtp_utils.h
index 43f6c66..f1275a9 100644
--- a/remoting/protocol/rtp_utils.h
+++ b/remoting/protocol/rtp_utils.h
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 
 namespace remoting {
+namespace protocol {
 
 struct RtpHeader {
   // RTP version is always set to 2.
@@ -35,6 +36,7 @@ void PackRtpHeader(uint8* buffer, int buffer_size,
 int UnpackRtpHeader(const uint8* buffer, int buffer_size,
                     RtpHeader* header);
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_RTP_UTILS_H_
diff --git a/remoting/protocol/rtp_video_reader.cc b/remoting/protocol/rtp_video_reader.cc
index 8f30613..8660371 100644
--- a/remoting/protocol/rtp_video_reader.cc
+++ b/remoting/protocol/rtp_video_reader.cc
@@ -8,6 +8,7 @@
 #include "remoting/protocol/session.h"
 
 namespace remoting {
+namespace protocol {
 
 RtpVideoReader::RtpVideoReader() { }
 RtpVideoReader::~RtpVideoReader() { }
@@ -38,4 +39,5 @@ void RtpVideoReader::OnRtpPacket(const RtpPacket& rtp_packet) {
   video_stub_->ProcessVideoPacket(packet, new DeleteTask<VideoPacket>(packet));
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/rtp_video_reader.h b/remoting/protocol/rtp_video_reader.h
index 39a8c33..ccfb53e 100644
--- a/remoting/protocol/rtp_video_reader.h
+++ b/remoting/protocol/rtp_video_reader.h
@@ -9,10 +9,9 @@
 #include "remoting/protocol/video_reader.h"
 
 namespace remoting {
-
 namespace protocol {
+
 class Session;
-}  // namespace protocol
 
 class RtpVideoReader : public VideoReader {
  public:
@@ -34,6 +33,7 @@ class RtpVideoReader : public VideoReader {
   DISALLOW_COPY_AND_ASSIGN(RtpVideoReader);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_RTP_VIDEO_READER_H_
diff --git a/remoting/protocol/rtp_video_writer.cc b/remoting/protocol/rtp_video_writer.cc
index 5fb645c..5bd1c80 100644
--- a/remoting/protocol/rtp_video_writer.cc
+++ b/remoting/protocol/rtp_video_writer.cc
@@ -8,6 +8,7 @@
 #include "remoting/protocol/rtp_writer.h"
 
 namespace remoting {
+namespace protocol {
 
 RtpVideoWriter::RtpVideoWriter() { }
 
@@ -32,4 +33,5 @@ void RtpVideoWriter::Close() {
   rtp_writer_.Close();
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/rtp_video_writer.h b/remoting/protocol/rtp_video_writer.h
index a0bd3b9..3d05925 100644
--- a/remoting/protocol/rtp_video_writer.h
+++ b/remoting/protocol/rtp_video_writer.h
@@ -9,10 +9,9 @@
 #include "remoting/protocol/video_writer.h"
 
 namespace remoting {
-
 namespace protocol {
+
 class Session;
-}  // namespace protocol
 
 class RtpVideoWriter : public VideoWriter {
  public:
@@ -31,6 +30,7 @@ class RtpVideoWriter : public VideoWriter {
   DISALLOW_COPY_AND_ASSIGN(RtpVideoWriter);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_RTP_VIDEO_WRITER_H_
diff --git a/remoting/protocol/rtp_writer.cc b/remoting/protocol/rtp_writer.cc
index 909a572..c27260e 100644
--- a/remoting/protocol/rtp_writer.cc
+++ b/remoting/protocol/rtp_writer.cc
@@ -9,6 +9,7 @@
 #include "remoting/protocol/rtp_utils.h"
 
 namespace remoting {
+namespace protocol {
 
 namespace {
 const int kMtu = 1200;
@@ -89,4 +90,5 @@ void RtpWriter::Close() {
   buffered_rtp_writer_->Close();
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/rtp_writer.h b/remoting/protocol/rtp_writer.h
index 6bcd7ec..86e92c0 100644
--- a/remoting/protocol/rtp_writer.h
+++ b/remoting/protocol/rtp_writer.h
@@ -9,6 +9,7 @@
 #include "remoting/protocol/buffered_socket_writer.h"
 
 namespace remoting {
+namespace protocol {
 
 class RtpWriter {
  public:
@@ -38,6 +39,7 @@ class RtpWriter {
   scoped_refptr<BufferedDatagramWriter> buffered_rtp_writer_;
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_RTP_WRITER_H_
diff --git a/remoting/protocol/session.h b/remoting/protocol/session.h
index 9319fef..0b63d17 100644
--- a/remoting/protocol/session.h
+++ b/remoting/protocol/session.h
@@ -25,8 +25,7 @@ namespace protocol {
 // Provides access to the connection channels, but doesn't depend on the
 // protocol used for each channel.
 // TODO(sergeyu): Remove refcounting?
-class Session
-    : public base::RefCountedThreadSafe<Session> {
+class Session : public base::RefCountedThreadSafe<Session> {
  public:
   enum State {
     INITIALIZING,
diff --git a/remoting/protocol/stream_writer.cc b/remoting/protocol/stream_writer.cc
index 2ed9121..33a4798 100644
--- a/remoting/protocol/stream_writer.cc
+++ b/remoting/protocol/stream_writer.cc
@@ -9,6 +9,7 @@
 #include "remoting/protocol/util.h"
 
 namespace remoting {
+namespace protocol {
 
 StreamWriterBase::StreamWriterBase()
     : socket_(NULL),
@@ -42,4 +43,5 @@ bool ControlStreamWriter::SendMessage(const ChromotingHostMessage& message) {
   return buffered_writer_->Write(SerializeAndFrameMessage(message));
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/stream_writer.h b/remoting/protocol/stream_writer.h
index f5b018b..7c5a3bd 100644
--- a/remoting/protocol/stream_writer.h
+++ b/remoting/protocol/stream_writer.h
@@ -13,6 +13,7 @@ class Socket;
 }  // namespace net
 
 namespace remoting {
+namespace protocol {
 
 class BufferedSocketWriter;
 
@@ -52,6 +53,7 @@ class ControlStreamWriter : public StreamWriterBase {
   bool SendMessage(const ChromotingHostMessage& message);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_STREAM_WRITER_H_
diff --git a/remoting/protocol/video_reader.cc b/remoting/protocol/video_reader.cc
index 63cdae3..b026ac9 100644
--- a/remoting/protocol/video_reader.cc
+++ b/remoting/protocol/video_reader.cc
@@ -9,6 +9,7 @@
 #include "remoting/protocol/rtp_video_reader.h"
 
 namespace remoting {
+namespace protocol {
 
 VideoReader::~VideoReader() { }
 
@@ -23,4 +24,5 @@ VideoReader* VideoReader::Create(const ChromotocolConfig* config) {
   return NULL;
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/video_reader.h b/remoting/protocol/video_reader.h
index 0c8ef87..9ead3c9f 100644
--- a/remoting/protocol/video_reader.h
+++ b/remoting/protocol/video_reader.h
@@ -21,6 +21,8 @@ class Session;
 class ChromotocolConfig;
 class ChromotocolConnection;
 
+namespace protocol {
+
 class VideoReader {
  public:
   static VideoReader* Create(const ChromotocolConfig* config);
@@ -42,6 +44,7 @@ class VideoReader {
   DISALLOW_COPY_AND_ASSIGN(VideoReader);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_VIDEO_READER_H_
diff --git a/remoting/protocol/video_stub.h b/remoting/protocol/video_stub.h
index 9f9657f..5c59ca0 100644
--- a/remoting/protocol/video_stub.h
+++ b/remoting/protocol/video_stub.h
@@ -10,6 +10,7 @@
 class Task;
 
 namespace remoting {
+namespace protocol {
 
 class VideoStub {
  public:
@@ -28,6 +29,7 @@ class VideoStub {
   DISALLOW_COPY_AND_ASSIGN(VideoStub);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_VIDEO_STUB_H_
diff --git a/remoting/protocol/video_writer.cc b/remoting/protocol/video_writer.cc
index c451010..6fc7a88 100644
--- a/remoting/protocol/video_writer.cc
+++ b/remoting/protocol/video_writer.cc
@@ -9,6 +9,7 @@
 #include "remoting/protocol/rtp_video_writer.h"
 
 namespace remoting {
+namespace protocol {
 
 VideoWriter::~VideoWriter() { }
 
@@ -23,4 +24,5 @@ VideoWriter* VideoWriter::Create(const ChromotocolConfig* config) {
   return NULL;
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/video_writer.h b/remoting/protocol/video_writer.h
index 49bdeb6..0b39bcb 100644
--- a/remoting/protocol/video_writer.h
+++ b/remoting/protocol/video_writer.h
@@ -22,6 +22,8 @@ class Session;
 class ChromotocolConfig;
 class ChromotocolConnection;
 
+namespace protocol {
+
 // TODO(sergeyu): VideoWriter should implement VideoStub interface.
 class VideoWriter {
  public:
@@ -47,6 +49,7 @@ class VideoWriter {
   DISALLOW_COPY_AND_ASSIGN(VideoWriter);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_VIDEO_WRITER_H_