Simplify message parsing.

remoting/protocol/host_event_dispatcher.cc

 // Copyright (c) 2012 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 "remoting/protocol/host_event_dispatcher.h"
 
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/input_stub.h"
+#include "remoting/protocol/message_serialization.h"
 
 namespace remoting {
 namespace protocol {
 
 HostEventDispatcher::HostEventDispatcher()
-    : ChannelDispatcherBase(kEventChannelName),
-      input_stub_(nullptr),
-      parser_(base::Bind(&HostEventDispatcher::OnMessageReceived,
-                         base::Unretained(this)),
-              reader()) {}
-
+    : ChannelDispatcherBase(kEventChannelName) {}
 HostEventDispatcher::~HostEventDispatcher() {}
 
-void HostEventDispatcher::OnMessageReceived(scoped_ptr<EventMessage> message) {
+void HostEventDispatcher::OnIncomingMessage(scoped_ptr<CompoundBuffer> buffer) {
   DCHECK(input_stub_);
 
+  scoped_ptr<EventMessage> message = ParseMessage<EventMessage>(buffer.get());
+  if (!message)
+    return;
+
   if (!on_input_event_callback_.is_null())
     on_input_event_callback_.Run(message->timestamp());
 
   if (message->has_key_event()) {
     const KeyEvent& event = message->key_event();
     if (event.has_usb_keycode() && event.has_pressed()) {
       input_stub_->InjectKeyEvent(event);
     } else {
       LOG(WARNING) << "Received invalid key event.";
     }
   } else if (message->has_text_event()) {
     const TextEvent& event = message->text_event();
     if (event.has_text()) {
       input_stub_->InjectTextEvent(event);
     } else {
       LOG(WARNING) << "Received invalid text event.";
     }
   } else if (message->has_mouse_event()) {
     input_stub_->InjectMouseEvent(message->mouse_event());
   } else if (message->has_touch_event()) {
     input_stub_->InjectTouchEvent(message->touch_event());
   } else {
     LOG(WARNING) << "Unknown event message received.";
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting