Remote Assistance on Chrome OS Part II - Native Messaging renaming

remoting/host/setup/me2me_native_messaging_host.cc

 // 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.
 
 #include "remoting/host/setup/me2me_native_messaging_host.h"
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/stringize_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/google_api_keys.h"
 #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"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include "base/win/win_util.h"
 #include "remoting/host/win/security_descriptor.h"
 #endif  // defined(OS_WIN)
 
@@ skipping 31 matching lines @@
   return result.Pass();
 }
 
 }  // namespace
 
 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)
     : needs_elevation_(needs_elevation),
       parent_window_handle_(parent_window_handle),
       channel_(channel.Pass()),
       daemon_controller_(daemon_controller),
       pairing_registry_(pairing_registry),
       oauth_client_(oauth_client.Pass()),
       weak_factory_(this) {
@@ skipping 565 matching lines @@
   if (!::ConnectNamedPipe(delegate_read_handle.Get(), NULL)) {
     DWORD error = ::GetLastError();
     if (error != ERROR_PIPE_CONNECTED) {
       PLOG(ERROR) << "Unable to connect '" << output_pipe_name << "'";
       OnError();
       return;
     }
   }
 
   // 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_),
       base::Bind(&Me2MeNativeMessagingHost::Stop, weak_ptr_));
 
   elevated_host_timer_.Start(
       FROM_HERE, base::TimeDelta::FromSeconds(kElevatedHostTimeoutSeconds),
       this, &Me2MeNativeMessagingHost::DisconnectElevatedHost);
 }
 
@@ skipping 16 matching lines @@
 
 bool Me2MeNativeMessagingHost::DelegateToElevatedHost(
     scoped_ptr<base::DictionaryValue> message) {
   NOTREACHED();
   return false;
 }
 
 #endif  // !defined(OS_WIN)
 
 }  // namespace remoting