Remote Assistance on Chrome OS Part III - NativeMessageHost

remoting/host/it2me/it2me_native_messaging_host_unittest.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/it2me/it2me_native_messaging_host.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/stringize_macros.h"
 #include "base/values.h"
 #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/native_messaging/native_messaging_pipe.h"
 #include "remoting/host/native_messaging/pipe_messaging_channel.h"
 #include "remoting/host/setup/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 
 namespace {
 
 const char kTestAccessCode[] = "888888";
 const int kTestAccessCodeLifetimeInSeconds = 666;
@@ skipping 172 matching lines @@
 
   // Message loop of the test thread.
   scoped_ptr<base::MessageLoop> test_message_loop_;
   scoped_ptr<base::RunLoop> test_run_loop_;
 
   scoped_ptr<base::Thread> host_thread_;
   scoped_ptr<base::RunLoop> host_run_loop_;
 
   // Task runner of the host thread.
   scoped_refptr<AutoThreadTaskRunner> host_task_runner_;
-  scoped_ptr<remoting::It2MeNativeMessagingHost> host_;
+  scoped_ptr<remoting::NativeMessagingPipe> host_;

[Sergey Ulanov, 2014/09/27 00:24:10]

rename this, e.g. pipe_?

[kelvinp, 2014/09/29 22:59:40]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(It2MeNativeMessagingHostTest);
 };
 
 void It2MeNativeMessagingHostTest::SetUp() {
   test_message_loop_.reset(new base::MessageLoop());
   test_run_loop_.reset(new base::RunLoop());
 
   // Run the host on a dedicated thread.
   host_thread_.reset(new base::Thread("host_thread"));
@@ skipping 201 matching lines @@
 
   base::File input_read_file;
   base::File output_write_file;
 
   ASSERT_TRUE(MakePipe(&input_read_file, &input_write_file_));
   ASSERT_TRUE(MakePipe(&output_read_file_, &output_write_file));
 
   // Creating a native messaging host with a mock It2MeHostFactory.
   scoped_ptr<It2MeHostFactory> factory(new MockIt2MeHostFactory());
 
+  host_.reset(new NativeMessagingPipe());
+
   scoped_ptr<extensions::NativeMessagingChannel> channel(
       new PipeMessagingChannel(input_read_file.Pass(),
                                output_write_file.Pass()));
 
-  host_.reset(new It2MeNativeMessagingHost(
-      host_task_runner_,
-      channel.Pass(),
-      factory.Pass()));
+  scoped_ptr<extensions::NativeMessageHost> it2meHost(

[Sergey Ulanov, 2014/09/27 00:24:10]

it2me_host

[kelvinp, 2014/09/29 22:59:40]

Done.

+      new It2MeNativeMessagingHost(
+          host_task_runner_,
+          factory.Pass()));
+  it2meHost->set_client(host_->AsWeakPtr());
+
   host_->Start(base::Bind(&It2MeNativeMessagingHostTest::StopHost,

[Sergey Ulanov, 2014/09/27 00:24:10]

I think you also want to call Init() here. (but it's better to merge Init() and
Start() to a single method).

[kelvinp, 2014/09/29 22:59:40]

Good catch.
I think it is better to keep the construction of the object (init) and starting
the object (which has the side effect of receiving messages) separate.

                           base::Unretained(this)));
 
   // Notify the test that the host has finished starting up.
   test_message_loop_->message_loop_proxy()->PostTask(
       FROM_HERE, test_run_loop_->QuitClosure());
 }
 
 void It2MeNativeMessagingHostTest::StopHost() {
   DCHECK(host_task_runner_->RunsTasksOnCurrentThread());
 
@@ skipping 94 matching lines @@
 
 // Verify rejection if type is unrecognized.
 TEST_F(It2MeNativeMessagingHostTest, InvalidType) {
   base::DictionaryValue message;
   message.SetString("type", "xxx");
   TestBadRequest(message, true);
 }
 
 }  // namespace remoting