Simplify message parsing.

remoting/protocol/client_control_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/client_control_dispatcher.h"
 
 #include <stdint.h>
 
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 41 matching lines @@
                << cursor_shape.data().size() << " bytes";
     return false;
   }
 
   return true;
 }
 
 }  // namespace
 
 ClientControlDispatcher::ClientControlDispatcher()
-    : ChannelDispatcherBase(kControlChannelName),
-      client_stub_(nullptr),
-      clipboard_stub_(nullptr),
-      parser_(base::Bind(&ClientControlDispatcher::OnMessageReceived,
-                         base::Unretained(this)),
-              reader()) {}
-
+    : ChannelDispatcherBase(kControlChannelName) {}
 ClientControlDispatcher::~ClientControlDispatcher() {}
 
 void ClientControlDispatcher::InjectClipboardEvent(
     const ClipboardEvent& event) {
   ControlMessage message;
   message.mutable_clipboard_event()->CopyFrom(event);
   writer()->Write(SerializeAndFrameMessage(message), base::Closure());
 }
 
 void ClientControlDispatcher::NotifyClientResolution(
@@ skipping 29 matching lines @@
   writer()->Write(SerializeAndFrameMessage(message), base::Closure());
 }
 
 void ClientControlDispatcher::DeliverClientMessage(
     const ExtensionMessage& message) {
   ControlMessage control_message;
   control_message.mutable_extension_message()->CopyFrom(message);
   writer()->Write(SerializeAndFrameMessage(control_message), base::Closure());
 }
 
-void ClientControlDispatcher::OnMessageReceived(
-    scoped_ptr<ControlMessage> message) {
+void ClientControlDispatcher::OnIncomingMessage(
+    scoped_ptr<CompoundBuffer> buffer) {
   DCHECK(client_stub_);
   DCHECK(clipboard_stub_);
 
+  scoped_ptr<ControlMessage> message =
+      ParseMessage<ControlMessage>(buffer.get());
+  if (!message)
+    return;
+
   if (message->has_clipboard_event()) {
     clipboard_stub_->InjectClipboardEvent(message->clipboard_event());
   } else if (message->has_capabilities()) {
     client_stub_->SetCapabilities(message->capabilities());
   } else if (message->has_cursor_shape()) {
     if (CursorShapeIsValid(message->cursor_shape()))
       client_stub_->SetCursorShape(message->cursor_shape());
   } else if (message->has_pairing_response()) {
     client_stub_->SetPairingResponse(message->pairing_response());
   } else if (message->has_extension_message()) {
     client_stub_->DeliverHostMessage(message->extension_message());
   } else {
     LOG(WARNING) << "Unknown control message received.";
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting