Remote Assistance on Chrome OS Part II - Native Messaging renaming

remoting/host/setup/me2me_native_messaging_host.h

Index: remoting/host/setup/me2me_native_messaging_host.h
diff --git a/remoting/host/setup/me2me_native_messaging_host.h b/remoting/host/setup/me2me_native_messaging_host.h
index e4a6748aba8c0354d088115b079a2331b10ff368..e402d521a3fa33ed5ab235cc4cbf2747133f0ba8 100644
--- a/remoting/host/setup/me2me_native_messaging_host.h
+++ b/remoting/host/setup/me2me_native_messaging_host.h
@@ -10,7 +10,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
-#include "remoting/host/native_messaging/native_messaging_channel.h"
+#include "extensions/browser/api/messaging/native_messaging_channel.h"
+

[Sergey Ulanov, 2014/09/18 18:08:36]

remove this empty line

[kelvinp, 2014/09/18 19:03:50]

Done.

 #include "remoting/host/setup/daemon_controller.h"
 #include "remoting/host/setup/oauth_client.h"
 
@@ -34,14 +35,13 @@ class PairingRegistry;
 }  // namespace protocol
 
 // Implementation of the me2me native messaging host.
-class Me2MeNativeMessagingHost {
+class Me2MeNativeMessagingHost
+    : public extensions::NativeMessagingChannel::EventHandler {
  public:
-  typedef NativeMessagingChannel::SendMessageCallback SendMessageCallback;
-
   Me2MeNativeMessagingHost(
       bool needs_elevation,
       intptr_t parent_window_handle,
-      scoped_ptr<NativeMessagingChannel> channel,
+      scoped_ptr<extensions::NativeMessagingChannel> channel,
       scoped_refptr<DaemonController> daemon_controller,
       scoped_refptr<protocol::PairingRegistry> pairing_registry,
       scoped_ptr<OAuthClient> oauth_client);
@@ -49,11 +49,11 @@ class Me2MeNativeMessagingHost {
 
   void Start(const base::Closure& quit_closure);
 
- private:
-  // Callback to process messages from the native messaging client through
-  // |channel_|.
-  void ProcessRequest(scoped_ptr<base::DictionaryValue> message);
+  // extensions::NativeMessagingChannel::EventHandler implementation
+  virtual void OnMessage(scoped_ptr<base::Value> message) OVERRIDE;
+  virtual void OnDisconnect() 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).
@@ -131,20 +131,31 @@ class Me2MeNativeMessagingHost {
   bool DelegateToElevatedHost(scoped_ptr<base::DictionaryValue> message);
 
 #if defined(OS_WIN)
+  class ElevatedChannelEventHandler
+      : public extensions::NativeMessagingChannel::EventHandler {
+   public:
+    ElevatedChannelEventHandler(Me2MeNativeMessagingHost* host);
+
+    virtual void OnMessage(scoped_ptr<base::Value> message) OVERRIDE;
+    virtual void OnDisconnect() OVERRIDE;
+   private:
+    Me2MeNativeMessagingHost* parent_;
+  };
+
   // 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 Me2MeNativeMessagingHost::EnsureElevatedHostCreated();
 
-  // Callback to process messages from the elevated host through
-  // |elevated_channel_|.
-  void ProcessDelegateResponse(scoped_ptr<base::DictionaryValue> message);
-
   // Disconnect and shut down the elevated host.
   void DisconnectElevatedHost();
 
   // Native messaging channel used to communicate with the elevated host.
-  scoped_ptr<NativeMessagingChannel> elevated_channel_;
+  scoped_ptr<extensions::NativeMessagingChannel> elevated_channel_;
+
+  // Native messaging event handler used to process responses from the elevated
+  // host.
+  scoped_ptr<ElevatedChannelEventHandler> elevated_channel_event_handler_;

[Sergey Ulanov, 2014/09/18 18:08:36]

I think this doesn't need to be a pointer.

[kelvinp, 2014/09/18 19:03:51]

|elevated_channel_event_handler| and Me2MeNativeMessaginHost has a different
slightly lifetime.  |elevated_channel_event_handler| is   constructed lazily
when elevation is required, with the stdio of the elevated child process as the
parameters.  As a result, it cannot be declared by a class member variable as it
won't be initialized in the constructor of Me2MeNativeMessaginHost.

 
   // Timer to control the lifetime of the elevated host.
   base::OneShotTimer<Me2MeNativeMessagingHost> elevated_host_timer_;
@@ -159,7 +170,7 @@ class Me2MeNativeMessagingHost {
 
   // Native messaging channel used to communicate with the native message
   // client.
-  scoped_ptr<NativeMessagingChannel> channel_;
+  scoped_ptr<extensions::NativeMessagingChannel> channel_;
   scoped_refptr<DaemonController> daemon_controller_;
 
   // Used to load and update the paired clients for this host.