Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/it2me/it2me_native_messaging_host_main.cc

Index: remoting/host/it2me/it2me_native_messaging_host_main.cc
diff --git a/remoting/host/it2me/it2me_native_messaging_host_main.cc b/remoting/host/it2me/it2me_native_messaging_host_main.cc
index 7d27d19e1d061c7755e4bb0aaef44aef174ec73d..87f2a8ec36b87798f8241756b6745a27fcead23e 100644
--- a/remoting/host/it2me/it2me_native_messaging_host_main.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host_main.cc
@@ -9,10 +9,10 @@
 #include "base/i18n/icu_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "media/base/media.h"
 #include "net/socket/ssl_server_socket.h"
 #include "remoting/base/breakpad.h"
 #include "remoting/base/resources.h"
+#include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/host_exit_codes.h"
 #include "remoting/host/it2me/it2me_native_messaging_host.h"
 #include "remoting/host/logging.h"
@@ -80,9 +80,6 @@ int StartIt2MeNativeMessagingHost() {
   // single-threaded.
   net::EnableSSLServerSockets();
 
-  // Ensures runtime specific CPU features are initialized.
-  media::InitializeCPUSpecificMediaFeatures();
-
 #if defined(OS_WIN)
   // GetStdHandle() returns pseudo-handles for stdin and stdout even if
   // the hosting executable specifies "Windows" subsystem. However the returned
@@ -116,7 +113,7 @@ int StartIt2MeNativeMessagingHost() {
       new remoting::AutoThreadTaskRunner(message_loop.message_loop_proxy(),
                                          run_loop.QuitClosure());
 
-  scoped_ptr<It2MeHostFactory> factory(new It2MeHostFactory());
+  scoped_ptr<It2MeHostFactory> factory(new It2MeHostFactory(nullptr));

[Wez, 2014/10/24 00:28:48]

nit: Add a comment to explain the nullptr

[kelvinp, 2014/10/24 21:39:42]

Done.

 
   scoped_ptr<NativeMessagingPipe> native_messaging_pipe(
       new NativeMessagingPipe());
@@ -126,8 +123,7 @@ int StartIt2MeNativeMessagingHost() {
       new PipeMessagingChannel(read_file.Pass(), write_file.Pass()));
 
   scoped_ptr<extensions::NativeMessageHost> host(new It2MeNativeMessagingHost(
-      task_runner,
-      factory.Pass()));
+      ChromotingHostContext::Create(task_runner), factory.Pass()));
 
   host->Start(native_messaging_pipe.get());