HostMessageDispatcher to parse control messages

remoting/host/client_connection.h

Index: remoting/host/client_connection.h
diff --git a/remoting/host/client_connection.h b/remoting/host/client_connection.h
index d8cf305723c451e5c2985f9949dde6ac1bd2c1b2..69283e2aa06f8f0debac49df1f03a80270ea1858 100644
--- a/remoting/host/client_connection.h
+++ b/remoting/host/client_connection.h
@@ -13,7 +13,7 @@
 #include "base/scoped_ptr.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/chromotocol_connection.h"
-#include "remoting/protocol/stream_reader.h"
+#include "remoting/protocol/message_reader.h"
 #include "remoting/protocol/stream_writer.h"
 
 namespace remoting {
@@ -87,7 +87,7 @@ class ClientConnection : public base::RefCountedThreadSafe<ClientConnection> {
   // Callback for ChromotocolConnection.
   void OnConnectionStateChange(ChromotocolConnection::State state);
 
-  // Callback for EventsStreamReader.
+  // Callback for MessageReader.
   void OnMessageReceived(ChromotingClientMessage* message);
 
   // Process a libjingle state change event on the |loop_|.
@@ -101,7 +101,7 @@ class ClientConnection : public base::RefCountedThreadSafe<ClientConnection> {
   // The libjingle channel used to send and receive data from the remote client.
   scoped_refptr<ChromotocolConnection> connection_;
 
-  EventStreamReader event_reader_;
+  MessageReader event_reader_;
   VideoStreamWriter video_writer_;
 
   // The message loop that this object runs on.