Remote Assistance on Chrome OS Part II - Native Messaging renaming

remoting/host/setup/me2me_native_messaging_host.cc

Index: remoting/host/setup/me2me_native_messaging_host.cc
diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc
index 51b77ef574887820a5e37c5b60d58763940dfd51..f245df8523630ac70e34f29dd5c006d5373da738 100644
--- a/remoting/host/setup/me2me_native_messaging_host.cc
+++ b/remoting/host/setup/me2me_native_messaging_host.cc
@@ -21,6 +21,7 @@
 #include "ipc/ipc_channel.h"
 #include "net/base/net_util.h"
 #include "remoting/base/rsa_key_pair.h"
+#include "remoting/host/native_messaging/pipe_messaging_channel.h"
 #include "remoting/host/pin_hash.h"
 #include "remoting/host/setup/oauth_client.h"
 #include "remoting/protocol/pairing_registry.h"
@@ -72,7 +73,7 @@ namespace remoting {
 Me2MeNativeMessagingHost::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)
@@ -658,10 +659,11 @@ void Me2MeNativeMessagingHost::EnsureElevatedHostCreated() {
   }
 
   // Set up the native messaging channel to talk to the elevated host.
-  // Note that input for the elevate channel is output forthe elevated host.
-  elevated_channel_.reset(new NativeMessagingChannel(
+  // Note that input for the elevate channel is output for the elevated host.
+  scoped_ptr<PipeMessagingChannel> channel = new PipeMessagingChannel(
       base::File(delegate_read_handle.Take()),
-      base::File(delegate_write_handle.Take())));
+      base::File(delegate_write_handle.Take()));
+  elevated_channel_.reset(channel.PassAs<extensions::NativeMessagingChannel>());
 
   elevated_channel_->Start(
       base::Bind(&Me2MeNativeMessagingHost::ProcessDelegateResponse, weak_ptr_),