Shutdown the It2Me host cleanly.

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"
@@ skipping 172 matching lines @@
 
   // The Host process should shut down when it receives a malformed request.
   // This is tested by sending a known-good request, followed by |message|,
   // followed by the known-good request again. The response file should only
   // contain a single response from the first good request.
   void TestBadRequest(const base::Value& message, bool expect_error_response);
   void TestConnect();
 
  private:
   void StartHost();
-  void StopHost();
   void ExitTest();
 
   // Each test creates two unidirectional pipes: "input" and "output".
   // It2MeNativeMessagingHost reads from input_read_file and writes to
   // output_write_file. The unittest supplies data to input_write_handle, and
   // verifies output from output_read_handle.
   //
   // unittest -> [input] -> It2MeNativeMessagingHost -> [output] -> unittest
   base::File input_write_file_;
   base::File output_read_file_;
@@ skipping 28 matching lines @@
   host_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&It2MeNativeMessagingHostTest::StartHost,
                  base::Unretained(this)));
 
   // Wait until the host finishes starting.
   test_run_loop_->Run();
 }
 
 void It2MeNativeMessagingHostTest::TearDown() {
+  // Release reference to AutoThreadTaskRunner, so the host thread can be shut
+  // down.
+  host_task_runner_ = nullptr;
+
   // Closing the write-end of the input will send an EOF to the native
   // messaging reader. This will trigger a host shutdown.
   input_write_file_.Close();
 
   // Start a new RunLoop and Wait until the host finishes shutting down.
   test_run_loop_.reset(new base::RunLoop());
   test_run_loop_->Run();
 
   // Verify there are no more message in the output pipe.
   scoped_ptr<base::DictionaryValue> response = ReadMessageFromOutputPipe();
@@ skipping 184 matching lines @@
       new PipeMessagingChannel(input_read_file.Pass(),
                                output_write_file.Pass()));
 
   // Creating a native messaging host with a mock It2MeHostFactory.
   scoped_ptr<extensions::NativeMessageHost> it2me_host(
       new It2MeNativeMessagingHost(
           ChromotingHostContext::Create(host_task_runner_),
           make_scoped_ptr(new MockIt2MeHostFactory())));
   it2me_host->Start(pipe_.get());
 
-  pipe_->Start(it2me_host.Pass(),
-               channel.Pass(),
-               base::Bind(&It2MeNativeMessagingHostTest::StopHost,
-                          base::Unretained(this)));
+  pipe_->Start(it2me_host.Pass(), channel.Pass());
 
   // 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());
-
-  pipe_.reset();
-
-  // Wait till all shutdown tasks have completed.
-  base::RunLoop().RunUntilIdle();
-
-  // Trigger a test shutdown via ExitTest().
-  host_task_runner_ = nullptr;
-}
-
 void It2MeNativeMessagingHostTest::ExitTest() {
   if (!test_message_loop_->message_loop_proxy()->RunsTasksOnCurrentThread()) {
     test_message_loop_->message_loop_proxy()->PostTask(
         FROM_HERE,
         base::Bind(&It2MeNativeMessagingHostTest::ExitTest,
                    base::Unretained(this)));
     return;
   }
   test_run_loop_->Quit();
 }
@@ skipping 75 matching lines @@
 
 // Verify rejection if type is unrecognized.
 TEST_F(It2MeNativeMessagingHostTest, InvalidType) {
   base::DictionaryValue message;
   message.SetString("type", "xxx");
   TestBadRequest(message, true);
 }
 
 }  // namespace remoting