Refactoring Me2MeNativeMessagingHost to implement NativeMessageHost interface

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 <cstdint>
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
+#include "extensions/browser/api/messaging/native_message_host.h"
 #include "extensions/browser/api/messaging/native_messaging_channel.h"
-#include "remoting/host/native_messaging/log_message_handler.h"
 #include "remoting/host/setup/daemon_controller.h"
 #include "remoting/host/setup/oauth_client.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
+class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace gaia {
 class GaiaOAuthClient;
 }  // namespace gaia
 
 namespace remoting {
 
 namespace protocol {
 class PairingRegistry;
 }  // namespace protocol
 
+class ChromotingHostContext;
+class LogMessageHandler;
+
 // Implementation of the me2me native messaging host.
-class Me2MeNativeMessagingHost
-    : public extensions::NativeMessagingChannel::EventHandler {
+class Me2MeNativeMessagingHost : public extensions::NativeMessageHost {
  public:
   Me2MeNativeMessagingHost(
       bool needs_elevation,
       intptr_t parent_window_handle,
-      std::unique_ptr<extensions::NativeMessagingChannel> channel,
+      std::unique_ptr<ChromotingHostContext> host_context,
       scoped_refptr<DaemonController> daemon_controller,
       scoped_refptr<protocol::PairingRegistry> pairing_registry,
       std::unique_ptr<OAuthClient> oauth_client);
   ~Me2MeNativeMessagingHost() override;
 
-  void Start(const base::Closure& quit_closure);
-
-  // extensions::NativeMessagingChannel::EventHandler implementation
-  void OnMessage(std::unique_ptr<base::Value> message) override;
-  void OnDisconnect() override;
+  // extensions::NativeMessageHost implementation.
+  void OnMessage(const std::string& message) override;
+  void Start(extensions::NativeMessageHost::Client* client) override;
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner() const override;
 
  private:
   // 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).
   void ProcessHello(std::unique_ptr<base::DictionaryValue> message,
                     std::unique_ptr<base::DictionaryValue> response);
   void ProcessClearPairedClients(
       std::unique_ptr<base::DictionaryValue> message,
       std::unique_ptr<base::DictionaryValue> response);
@@ skipping 41 matching lines @@
   void SendUsageStatsConsentResponse(
       std::unique_ptr<base::DictionaryValue> response,
       const DaemonController::UsageStatsConsent& consent);
   void SendAsyncResult(std::unique_ptr<base::DictionaryValue> response,
                        DaemonController::AsyncResult result);
   void SendBooleanResult(std::unique_ptr<base::DictionaryValue> response,
                          bool result);
   void SendCredentialsResponse(std::unique_ptr<base::DictionaryValue> response,
                                const std::string& user_email,
                                const std::string& refresh_token);
+  void SendMessageToClient(std::unique_ptr<base::Value> message) const;
 
-  void OnError();
-
-  void Stop();
+  void OnError(const std::string& error_message);
 
   // Returns true if the request was successfully delegated to the elevated
   // host and false otherwise.
   bool DelegateToElevatedHost(std::unique_ptr<base::DictionaryValue> message);
 
 #if defined(OS_WIN)
   class ElevatedChannelEventHandler
       : public extensions::NativeMessagingChannel::EventHandler {
    public:
-    ElevatedChannelEventHandler(Me2MeNativeMessagingHost* host);
+    ElevatedChannelEventHandler(extensions::NativeMessageHost::Client* client);
 
+    // extensions::NativeMessagingChannel::EventHandler implementation.
     void OnMessage(std::unique_ptr<base::Value> message) override;
     void OnDisconnect() override;
    private:

[Sergey Ulanov, 2016/08/01 18:45:19]

nit: empty line above this one

[joedow, 2016/08/01 19:21:34]

Done.

-    Me2MeNativeMessagingHost* parent_;
+    extensions::NativeMessageHost::Client* client_;
+
+    base::ThreadChecker thread_checker_;
   };
 
   // Create and connect to an elevated host process if necessary.
   // |elevated_channel_| will contain the native messaging channel to the
   // elevated host if the function succeeds.
   void EnsureElevatedHostCreated();
 
   // Disconnect and shut down the elevated host.
   void DisconnectElevatedHost();
 
   // Native messaging channel used to communicate with the elevated host.
   std::unique_ptr<extensions::NativeMessagingChannel> elevated_channel_;
 
   // Native messaging event handler used to process responses from the elevated
   // host.
   std::unique_ptr<ElevatedChannelEventHandler> elevated_channel_event_handler_;
 
   // Timer to control the lifetime of the elevated host.
   base::OneShotTimer elevated_host_timer_;
 #endif  // defined(OS_WIN)
 
   bool needs_elevation_;
 
 #if defined(OS_WIN)
   // Handle of the parent window.
   intptr_t parent_window_handle_;
 #endif  // defined(OS_WIN)
 
-  base::Closure quit_closure_;
+  extensions::NativeMessageHost::Client* client_;
+  std::unique_ptr<ChromotingHostContext> host_context_;
 
-  // Native messaging channel used to communicate with the native message
-  // client.
-  std::unique_ptr<extensions::NativeMessagingChannel> channel_;
-
-  LogMessageHandler log_message_handler_;
+  std::unique_ptr<LogMessageHandler> log_message_handler_;
 
   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.
   std::unique_ptr<OAuthClient> oauth_client_;
 
-  base::ThreadChecker thread_checker_;
-
   base::WeakPtr<Me2MeNativeMessagingHost> weak_ptr_;
   base::WeakPtrFactory<Me2MeNativeMessagingHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Me2MeNativeMessagingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_