Simplified MessageReader and MessageDecoder classes.

remoting/protocol/host_message_dispatcher.h

Index: remoting/protocol/host_message_dispatcher.h
diff --git a/remoting/protocol/host_message_dispatcher.h b/remoting/protocol/host_message_dispatcher.h
index 6274168e27770112681b25428eeba94d2be883b3..8ebed01aec9f7da83fbf0be60106a624688a5a95 100644
--- a/remoting/protocol/host_message_dispatcher.h
+++ b/remoting/protocol/host_message_dispatcher.h
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
+#include "remoting/protocol/message_reader.h"
 
 namespace remoting {
 
@@ -17,7 +18,6 @@ namespace protocol {
 
 class ControlMessage;
 class HostStub;
-class MessageReader;
 class InputStub;
 class Session;
 
@@ -54,10 +54,10 @@ class HostMessageDispatcher {
   // MessageReader that runs on the control channel. It runs a loop
   // that parses data on the channel and then delegates the message to this
   // class.
-  scoped_ptr<MessageReader> control_message_reader_;
+  scoped_ptr<ProtobufMessageReader<ControlMessage> > control_message_reader_;
 
   // MessageReader that runs on the event channel.
-  scoped_ptr<MessageReader> event_message_reader_;
+  scoped_ptr<ProtobufMessageReader<EventMessage> > event_message_reader_;
 
   // Stubs for host and input. These objects are not owned.
   // They are called on the thread there data is received, i.e. jingle thread.