| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
|  | 5 #include "base/message_loop/message_loop.h" | 
| 5 #include "base/test/launcher/unit_test_launcher.h" | 6 #include "base/test/launcher/unit_test_launcher.h" | 
| 6 #include "base/test/test_suite.h" | 7 #include "base/test/test_suite.h" | 
| 7 #include "base/threading/thread.h" | 8 #include "base/threading/thread.h" | 
| 8 #include "mojo/edk/embedder/embedder.h" | 9 #include "mojo/edk/embedder/embedder.h" | 
| 9 #include "mojo/edk/embedder/scoped_ipc_support.h" | 10 #include "mojo/edk/embedder/scoped_ipc_support.h" | 
| 10 | 11 | 
| 11 int main(int argc, char** argv) { | 12 int main(int argc, char** argv) { | 
| 12   base::TestSuite test_suite(argc, argv); | 13   base::TestSuite test_suite(argc, argv); | 
| 13 | 14 | 
| 14   base::Thread ipc_thread("IPC thread"); | 15   base::Thread ipc_thread("IPC thread"); | 
| 15   ipc_thread.StartWithOptions( | 16   ipc_thread.StartWithOptions( | 
| 16       base::Thread::Options(base::MessageLoop::TYPE_IO, 0)); | 17       base::Thread::Options(base::MessageLoop::TYPE_IO, 0)); | 
| 17 | 18 | 
| 18   mojo::edk::Init(); | 19   mojo::edk::Init(); | 
| 19   mojo::edk::ScopedIPCSupport ipc_support( | 20   mojo::edk::ScopedIPCSupport ipc_support( | 
| 20       ipc_thread.task_runner(), | 21       ipc_thread.task_runner(), | 
| 21       mojo::edk::ScopedIPCSupport::ShutdownPolicy::CLEAN); | 22       mojo::edk::ScopedIPCSupport::ShutdownPolicy::CLEAN); | 
| 22 | 23 | 
| 23   return base::LaunchUnitTests( | 24   return base::LaunchUnitTests( | 
| 24       argc, argv, base::Bind(&base::TestSuite::Run, | 25       argc, argv, base::Bind(&base::TestSuite::Run, | 
| 25                              base::Unretained(&test_suite))); | 26                              base::Unretained(&test_suite))); | 
| 26 } | 27 } | 
| OLD | NEW | 
|---|