Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Unified Diff: remoting/host/setup/me2me_native_messaging_host_unittest.cc

Issue 558403002: Remote Assistance on Chrome OS Part II - Native Messaging renaming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix windows host Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/setup/me2me_native_messaging_host_unittest.cc
diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
index 65ba4021a0845ca3029d06a26c42396bcd5ee263..86666ece4ec4389f9d72e487ed4a0a01bb617f28 100644
--- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc
+++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
@@ -17,7 +17,7 @@
#include "net/base/file_stream.h"
#include "net/base/net_util.h"
#include "remoting/base/auto_thread_task_runner.h"
-#include "remoting/host/native_messaging/native_messaging_channel.h"
+#include "remoting/host/native_messaging/pipe_messaging_channel.h"
#include "remoting/host/pin_hash.h"
#include "remoting/host/setup/test_util.h"
#include "remoting/protocol/pairing_registry.h"
@@ -323,14 +323,14 @@ void Me2MeNativeMessagingHostTest::StartHost() {
new SynchronousPairingRegistry(scoped_ptr<PairingRegistry::Delegate>(
new MockPairingRegistryDelegate()));
- scoped_ptr<NativeMessagingChannel> channel(
- new NativeMessagingChannel(input_read_file.Pass(),
+ scoped_ptr<PipeMessagingChannel> channel(
Sergey Ulanov 2014/09/18 18:08:36 scoped_ptr<extensions::NativeMessagingChannel>
kelvinp 2014/09/18 19:03:51 Done.
+ new PipeMessagingChannel(input_read_file.Pass(),
output_write_file.Pass()));
host_.reset(new Me2MeNativeMessagingHost(
false,
0,
- channel.Pass(),
+ channel.PassAs<extensions::NativeMessagingChannel>(),
daemon_controller,
pairing_registry,
scoped_ptr<remoting::OAuthClient>()));

Powered by Google App Engine
This is Rietveld 408576698