Index: remoting/host/it2me/it2me_native_messaging_host_unittest.cc |
diff --git a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc |
index 61334cfc45fb3b41172a0dffdc513e07205532bb..1c230c77a07568676fef81a0eaa0b092bd0c6b20 100644 |
--- a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc |
+++ b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc |
@@ -16,7 +16,7 @@ |
#include "net/base/file_stream.h" |
#include "net/base/net_util.h" |
#include "remoting/base/auto_thread_task_runner.h" |
-#include "remoting/host/chromoting_host_context.h" |
+#include "remoting/host/chromoting_host_context_impl.h" |
#include "remoting/host/native_messaging/native_messaging_pipe.h" |
#include "remoting/host/native_messaging/pipe_messaging_channel.h" |
#include "remoting/host/setup/test_util.h" |
@@ -67,7 +67,7 @@ void VerifyCommonProperties(scoped_ptr<base::DictionaryValue> response, |
class MockIt2MeHost : public It2MeHost { |
public: |
- MockIt2MeHost(ChromotingHostContext* context, |
+ MockIt2MeHost(scoped_refptr<ChromotingHostContext> context, |
scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
base::WeakPtr<It2MeHost::Observer> observer, |
const XmppSignalStrategy::XmppServerConfig& xmpp_server_config, |
@@ -150,13 +150,16 @@ class MockIt2MeHostFactory : public It2MeHostFactory { |
public: |
MockIt2MeHostFactory() {} |
virtual scoped_refptr<It2MeHost> CreateIt2MeHost( |
- ChromotingHostContext* context, |
+ scoped_refptr<ChromotingHostContext> context, |
scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
base::WeakPtr<It2MeHost::Observer> observer, |
const XmppSignalStrategy::XmppServerConfig& xmpp_server_config, |
const std::string& directory_bot_jid) override { |
- return new MockIt2MeHost( |
- context, task_runner, observer, xmpp_server_config, directory_bot_jid); |
+ return new MockIt2MeHost(context, |
+ task_runner, |
+ observer, |
+ xmpp_server_config, |
+ directory_bot_jid); |
} |
private: |
@@ -440,7 +443,7 @@ void It2MeNativeMessagingHostTest::StartHost() { |
scoped_ptr<extensions::NativeMessageHost> it2me_host( |
new It2MeNativeMessagingHost( |
- host_task_runner_, |
+ new ChromotingHostContextImpl(host_task_runner_.get()), |
factory.Pass())); |
it2me_host->Start(pipe_.get()); |