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

remoting/host/setup/me2me_native_messaging_host.h

 // 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.
 
 #ifndef REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_
 #define REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 10 matching lines @@
 namespace gaia {
 class GaiaOAuthClient;
 }  // namespace gaia
 
 namespace remoting {
 
 namespace protocol {
 class PairingRegistry;
 }  // namespace protocol
 
-// Implementation of the native messaging host process.
-class NativeMessagingHost : public NativeMessagingChannel::Delegate {
+// Implementation of the me2me native messaging host.
+class NativeMessagingHost {
  public:
   typedef NativeMessagingChannel::SendMessageCallback SendMessageCallback;
 
   NativeMessagingHost(
+      scoped_ptr<NativeMessagingChannel> channel,
       scoped_refptr<DaemonController> daemon_controller,
       scoped_refptr<protocol::PairingRegistry> pairing_registry,
       scoped_ptr<OAuthClient> oauth_client);
   virtual ~NativeMessagingHost();
 
-  // NativeMessagingChannel::Delegate interface.
-  virtual void SetSendMessageCallback(
-      const SendMessageCallback& send_message) OVERRIDE;
-  virtual void ProcessMessage(
-      scoped_ptr<base::DictionaryValue> message) OVERRIDE;
+  void Start(const base::Closure& quit_closure);
 
  private:
+  void ProcessMessage(scoped_ptr<base::DictionaryValue> message);
+
   // These "Process.." methods handle specific request types. The |response|
   // dictionary is pre-filled by ProcessMessage() with the parts of the
   // response already known ("id" and "type" fields).
   bool ProcessHello(
       const base::DictionaryValue& message,
       scoped_ptr<base::DictionaryValue> response);
   bool ProcessClearPairedClients(
       const base::DictionaryValue& message,
       scoped_ptr<base::DictionaryValue> response);
   bool ProcessDeletePairedClient(
@@ skipping 48 matching lines @@
       scoped_ptr<base::DictionaryValue> response,
       const DaemonController::UsageStatsConsent& consent);
   void SendAsyncResult(scoped_ptr<base::DictionaryValue> response,
                        DaemonController::AsyncResult result);
   void SendBooleanResult(scoped_ptr<base::DictionaryValue> response,
                          bool result);
   void SendCredentialsResponse(scoped_ptr<base::DictionaryValue> response,
                                const std::string& user_email,
                                const std::string& refresh_token);
 
+  scoped_ptr<NativeMessagingChannel> channel_;
   scoped_refptr<DaemonController> daemon_controller_;
 
   // Used to load and update the paired clients for this host.
   scoped_refptr<protocol::PairingRegistry> pairing_registry_;
 
   // Used to exchange the service account authorization code for credentials.
   scoped_ptr<OAuthClient> oauth_client_;
 
   base::ThreadChecker thread_checker_;
 
-  SendMessageCallback send_message_;
   base::WeakPtr<NativeMessagingHost> weak_ptr_;
   base::WeakPtrFactory<NativeMessagingHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeMessagingHost);
 };
 
 // Creates a NativeMessagingHost instance, attaches it to stdin/stdout and runs
 // the message loop until NativeMessagingHost signals shutdown.
 int NativeMessagingHostMain();
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_