Remove done notifications from incoming message handlers.

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"
-#include "base/callback_helpers.h"
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/message_serialization.h"
 
 namespace remoting {
 namespace protocol {
 
@@ skipping 36 matching lines @@
 }
 
 }  // namespace
 
 ClientControlDispatcher::ClientControlDispatcher()
     : ChannelDispatcherBase(kControlChannelName),
       client_stub_(nullptr),
       clipboard_stub_(nullptr),
       parser_(base::Bind(&ClientControlDispatcher::OnMessageReceived,
                          base::Unretained(this)),
-              reader()) {
-}
+              reader()) {}
 
-ClientControlDispatcher::~ClientControlDispatcher() {
-}
+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(
     const ClientResolution& resolution) {
@@ skipping 29 matching lines @@
 }
 
 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,
-    const base::Closure& done_task) {
+    scoped_ptr<ControlMessage> message) {
   DCHECK(client_stub_);
   DCHECK(clipboard_stub_);
-  base::ScopedClosureRunner done_runner(done_task);
 
   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