6 files changed, 18 insertions, 18 deletions
diff --git a/remoting/host/client_connection.cc b/remoting/host/client_connection.cc
index 6c8516a..b6e8759 100644
--- a/remoting/host/client_connection.cc
+++ b/remoting/host/client_connection.cc
@@ -38,10 +38,10 @@ ClientConnection::~ClientConnection() {
 // static
 scoped_refptr<media::DataBuffer>
     ClientConnection::CreateWireFormatDataBuffer(
-        const HostMessage* msg) {
+        const ChromotingHostMessage* msg) {
   // TODO(hclam): Instead of serializing |msg| create an DataBuffer
   // object that wraps around it.
-  scoped_ptr<const HostMessage> message_deleter(msg);
+  scoped_ptr<const ChromotingHostMessage> message_deleter(msg);
   return SerializeAndFrameMessage(*msg);
 }
 
@@ -53,7 +53,7 @@ void ClientConnection::SendInitClientMessage(int width, int height) {
   if (!channel_)
     return;
 
-  HostMessage msg;
+  ChromotingHostMessage msg;
   msg.mutable_init_client()->set_width(width);
   msg.mutable_init_client()->set_height(height);
   DCHECK(msg.IsInitialized());
@@ -67,7 +67,7 @@ void ClientConnection::SendBeginUpdateStreamMessage() {
   if (!channel_)
     return;
 
-  HostMessage msg;
+  ChromotingHostMessage msg;
   msg.mutable_begin_update_stream();
   DCHECK(msg.IsInitialized());
 
@@ -96,7 +96,7 @@ void ClientConnection::SendEndUpdateStreamMessage() {
   if (!channel_)
     return;
 
-  HostMessage msg;
+  ChromotingHostMessage msg;
   msg.mutable_end_update_stream();
   DCHECK(msg.IsInitialized());
 
diff --git a/remoting/host/client_connection.h b/remoting/host/client_connection.h
index c03a9bb..c139ff0 100644
--- a/remoting/host/client_connection.h
+++ b/remoting/host/client_connection.h
@@ -62,11 +62,11 @@ class ClientConnection : public base::RefCountedThreadSafe<ClientConnection>,
 
   virtual ~ClientConnection();
 
-  // Creates a DataBuffer object that wraps around HostMessage. The DataBuffer
-  // object will be responsible for serializing and framing the message.
-  // DataBuffer will also own |msg| after this call.
+  // Creates a DataBuffer object that wraps around ChromotingHostMessage. The
+  // DataBuffer object will be responsible for serializing and framing the
+  // message. DataBuffer will also own |msg| after this call.
   static scoped_refptr<media::DataBuffer> CreateWireFormatDataBuffer(
-      const HostMessage* msg);
+      const ChromotingHostMessage* msg);
 
   virtual void set_jingle_channel(JingleChannel* channel) {
     channel_ = channel;
@@ -84,11 +84,11 @@ class ClientConnection : public base::RefCountedThreadSafe<ClientConnection>,
   // Send encoded update stream data to the viewer.
   //
   // |data| is the actual bytes in wire format. That means it is fully framed
-  // and serialized from a HostMessage. This is a special case only for
-  // UpdateStreamPacket to reduce the amount of memory copies.
+  // and serialized from a ChromotingHostMessage. This is a special case only
+  // for UpdateStreamPacket to reduce the amount of memory copies.
   //
   // |data| should be created by calling to
-  // CreateWireFormatDataBuffer(HostMessage).
+  // CreateWireFormatDataBuffer(ChromotingHostMessage).
   virtual void SendUpdateStreamPacketMessage(
       scoped_refptr<media::DataBuffer> data);
 
diff --git a/remoting/host/event_executor_win.cc b/remoting/host/event_executor_win.cc
index de82a5a..258389e 100644
--- a/remoting/host/event_executor_win.cc
+++ b/remoting/host/event_executor_win.cc
@@ -355,7 +355,7 @@ EventExecutorWin::~EventExecutorWin() {
 
 void EventExecutorWin::HandleInputEvents(ClientMessageList* messages) {
   for (size_t i = 0; i < messages->size(); ++i) {
-    ClientMessage* msg = (*messages)[i];
+    ChromotingClientMessage* msg = (*messages)[i];
     if (msg->has_mouse_set_position_event()) {
       mouse_event(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE,
         static_cast<int>((msg->mouse_set_position_event().x() * 65535)),
diff --git a/remoting/host/session_manager.cc b/remoting/host/session_manager.cc
index f2cb3aa..b8747dd 100644
--- a/remoting/host/session_manager.cc
+++ b/remoting/host/session_manager.cc
@@ -319,7 +319,7 @@ void SessionManager::DoRateControl() {
   ScheduleNextRateControl();
 }
 
-void SessionManager::DoSendUpdate(HostMessage* message,
+void SessionManager::DoSendUpdate(ChromotingHostMessage* message,
                                   Encoder::EncodingState state) {
   DCHECK_EQ(network_loop_, MessageLoop::current());
 
@@ -393,7 +393,7 @@ void SessionManager::DoEncode(
 }
 
 void SessionManager::EncodeDataAvailableTask(
-    HostMessage* message, Encoder::EncodingState state) {
+    ChromotingHostMessage* message, Encoder::EncodingState state) {
   DCHECK_EQ(encode_loop_, MessageLoop::current());
 
   // Before a new encode task starts, notify clients a new update
diff --git a/remoting/host/session_manager.h b/remoting/host/session_manager.h
index 83c437a..c39ca3b 100644
--- a/remoting/host/session_manager.h
+++ b/remoting/host/session_manager.h
@@ -131,7 +131,7 @@ class SessionManager : public base::RefCountedThreadSafe<SessionManager> {
   void DoRateControl();
 
   // DoSendUpdate takes ownership of header and is responsible for deleting it.
-  void DoSendUpdate(HostMessage* message,
+  void DoSendUpdate(ChromotingHostMessage* message,
                     Encoder::EncodingState state);
   void DoSendInit(scoped_refptr<ClientConnection> client,
                   int width, int height);
@@ -146,7 +146,7 @@ class SessionManager : public base::RefCountedThreadSafe<SessionManager> {
 
   // EncodeDataAvailableTask takes ownership of header and is responsible for
   // deleting it.
-  void EncodeDataAvailableTask(HostMessage* message,
+  void EncodeDataAvailableTask(ChromotingHostMessage* message,
                                Encoder::EncodingState state);
 
   // Message loops used by this class.
diff --git a/remoting/host/session_manager_unittest.cc b/remoting/host/session_manager_unittest.cc
index 29fa0f8..6747b01 100644
--- a/remoting/host/session_manager_unittest.cc
+++ b/remoting/host/session_manager_unittest.cc
@@ -106,7 +106,7 @@ TEST_F(SessionManagerTest, OneRecordCycle) {
       .WillOnce(RunCallback(update_rects, data));
 
   // Expect the encoder be called.
-  HostMessage* msg = new HostMessage();
+  ChromotingHostMessage* msg = new ChromotingHostMessage();
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
       .WillOnce(FinishEncode(msg));