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..8997c4e9263ee4a8f061bef9719f4f9780db058b 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 "chrome/browser/extensions/api/messaging/native_messaging_channel.h"
+
 #include "remoting/host/setup/daemon_controller.h"
 #include "remoting/host/setup/oauth_client.h"
 
@@ -36,12 +37,13 @@ class PairingRegistry;
 // Implementation of the me2me native messaging host.
 class Me2MeNativeMessagingHost {
  public:
-  typedef NativeMessagingChannel::SendMessageCallback SendMessageCallback;
+  typedef extensions::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);
@@ -144,7 +146,7 @@ class Me2MeNativeMessagingHost {
   void DisconnectElevatedHost();
 
   // Native messaging channel used to communicate with the elevated host.
-  scoped_ptr<NativeMessagingChannel> elevated_channel_;
+  scoped_ptr<extensions::NativeMessagingChannel> elevated_channel_;
 
   // Timer to control the lifetime of the elevated host.
   base::OneShotTimer<Me2MeNativeMessagingHost> elevated_host_timer_;
@@ -159,7 +161,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.