Simplified MessageReader and MessageDecoder classes.

remoting/protocol/host_message_dispatcher.cc

 // Copyright (c) 2010 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.
 
 #include "base/ref_counted.h"
 #include "net/base/io_buffer.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/host_message_dispatcher.h"
@@ skipping 15 matching lines @@
 }
 
 void HostMessageDispatcher::Initialize(
     protocol::Session* session,
     HostStub* host_stub, InputStub* input_stub) {
   if (!session || !host_stub || !input_stub ||
       !session->event_channel() || !session->control_channel()) {
     return;
   }
 
-  control_message_reader_.reset(new MessageReader());
-  event_message_reader_.reset(new MessageReader());
+  control_message_reader_.reset(new ProtobufMessageReader<ControlMessage>());
+  event_message_reader_.reset(new ProtobufMessageReader<EventMessage>());
   host_stub_ = host_stub;
   input_stub_ = input_stub;
 
   // Initialize the readers on the sockets provided by channels.
-  event_message_reader_->Init<EventMessage>(
+  event_message_reader_->Init(
       session->event_channel(),
       NewCallback(this, &HostMessageDispatcher::OnEventMessageReceived));
-  control_message_reader_->Init<ControlMessage>(
+  control_message_reader_->Init(
       session->control_channel(),
       NewCallback(this, &HostMessageDispatcher::OnControlMessageReceived));
 }
 
 void HostMessageDispatcher::OnControlMessageReceived(ControlMessage* message) {
   scoped_refptr<RefCountedMessage<ControlMessage> > ref_msg =
       new RefCountedMessage<ControlMessage>(message);
   if (message->has_suggest_resolution()) {
     host_stub_->SuggestResolution(
         &message->suggest_resolution(), NewDeleteTask(ref_msg));
@@ skipping 17 matching lines @@
     }
     if (message->event(i).has_mouse()) {
       input_stub_->InjectMouseEvent(
           &message->event(i).mouse(), NewDeleteTask(ref_msg));
     }
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting