Simplified MessageReader and MessageDecoder classes.

remoting/protocol/client_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/client_message_dispatcher.h"
@@ skipping 11 matching lines @@
 
 ClientMessageDispatcher::~ClientMessageDispatcher() {
 }
 
 void ClientMessageDispatcher::Initialize(
     protocol::Session* session, ClientStub* client_stub) {
   if (!session || !client_stub || !session->control_channel()) {
     return;
   }
 
-  control_message_reader_.reset(new MessageReader());
+  control_message_reader_.reset(new ProtobufMessageReader<ControlMessage>());
   client_stub_ = client_stub;
 
-  control_message_reader_->Init<ControlMessage>(
+  control_message_reader_->Init(
       session->control_channel(),
       NewCallback(this, &ClientMessageDispatcher::OnControlMessageReceived));
   return;
 }
 
 void ClientMessageDispatcher::OnControlMessageReceived(
     ControlMessage* message) {
   scoped_refptr<RefCountedMessage<ControlMessage> > ref_msg =
       new RefCountedMessage<ControlMessage>(message);
   if (message->has_notify_resolution()) {
     client_stub_->NotifyResolution(
         &message->notify_resolution(), NewDeleteTask(ref_msg));
   } else if (message->has_begin_session_response()) {
     client_stub_->BeginSessionResponse(
         &message->begin_session_response().login_status(),
         NewDeleteTask(ref_msg));
   } else {
     NOTREACHED() << "Invalid control message received";
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting