Me2me Native Messaging host on Windows: restructure NativeMessagingHost and NativeMessagingChannel.…

remoting/host/native_messaging/native_messaging_channel.cc

 // Copyright 2013 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/host/native_messaging/native_messaging_channel.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ skipping 27 matching lines @@
 #else
 #error Not implemented.
 #endif
 }
 
 }  // namespace
 
 namespace remoting {
 
 NativeMessagingChannel::NativeMessagingChannel(
-    scoped_ptr<Delegate> delegate,
     base::PlatformFile input,
     base::PlatformFile output)
     : native_messaging_reader_(DuplicatePlatformFile(input)),
       native_messaging_writer_(new NativeMessagingWriter(
           DuplicatePlatformFile(output))),
-      delegate_(delegate.Pass()),
       weak_factory_(this) {
   weak_ptr_ = weak_factory_.GetWeakPtr();
-  delegate_->SetSendMessageCallback(
-      base::Bind(&NativeMessagingChannel::SendMessage, weak_ptr_));
 }
 
 NativeMessagingChannel::~NativeMessagingChannel() {
 }
 
-void NativeMessagingChannel::Start(const base::Closure& quit_closure) {
+void NativeMessagingChannel::Start(const SendMessageCallback& received_message,
+                                   const base::Closure& quit_closure) {
   DCHECK(CalledOnValidThread());
+  DCHECK(received_message_.is_null());
   DCHECK(quit_closure_.is_null());
-  DCHECK(!quit_closure.is_null());
 
+  received_message_ = received_message;
   quit_closure_ = quit_closure;
+
   native_messaging_reader_.Start(
       base::Bind(&NativeMessagingChannel::ProcessMessage, weak_ptr_),
       base::Bind(&NativeMessagingChannel::Shutdown, weak_ptr_));
 }
 
 void NativeMessagingChannel::ProcessMessage(scoped_ptr<base::Value> message) {
   DCHECK(CalledOnValidThread());
 
   if (message->GetType() != base::Value::TYPE_DICTIONARY) {
     LOG(ERROR) << "Expected DictionaryValue";
     Shutdown();
     return;
   }
 
   scoped_ptr<base::DictionaryValue> message_dict(
       static_cast<base::DictionaryValue*>(message.release()));
-  delegate_->ProcessMessage(message_dict.Pass());
+  received_message_.Run(message_dict.Pass());
 }
 
 void NativeMessagingChannel::SendMessage(
     scoped_ptr<base::DictionaryValue> message) {
   DCHECK(CalledOnValidThread());
 
   bool success = message && native_messaging_writer_;
   if (success)
     success = native_messaging_writer_->WriteMessage(*message);
 
   if (!success) {
     // Close the write pipe so no more responses will be sent.
     native_messaging_writer_.reset();
     Shutdown();
   }
 }
 
 void NativeMessagingChannel::Shutdown() {
   DCHECK(CalledOnValidThread());
 
   if (!quit_closure_.is_null())
     base::ResetAndReturn(&quit_closure_).Run();
 }
 
 }  // namespace remoting