OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/test/launcher/unit_test_launcher.h" | 7 #include "base/test/launcher/unit_test_launcher.h" |
8 #include "base/test/test_io_thread.h" | 8 #include "base/test/test_io_thread.h" |
| 9 #include "build/build_config.h" |
9 #include "content/app/mojo/mojo_init.h" | 10 #include "content/app/mojo/mojo_init.h" |
10 #include "content/public/test/unittest_test_suite.h" | 11 #include "content/public/test/unittest_test_suite.h" |
11 #include "content/test/content_test_suite.h" | 12 #include "content/test/content_test_suite.h" |
12 #include "third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h" | 13 #include "third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h" |
13 | 14 |
14 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
15 #include "base/android/jni_android.h" | 16 #include "base/android/jni_android.h" |
16 #include "base/test/test_file_util.h" | 17 #include "base/test/test_file_util.h" |
17 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 18 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
18 #endif | 19 #endif |
(...skipping 12 matching lines...) Expand all Loading... |
31 if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) { | 32 if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) { |
32 ipc_support.reset(new mojo::test::ScopedIPCSupport( | 33 ipc_support.reset(new mojo::test::ScopedIPCSupport( |
33 test_io_thread.task_runner())); | 34 test_io_thread.task_runner())); |
34 } | 35 } |
35 #endif | 36 #endif |
36 | 37 |
37 return base::LaunchUnitTests( | 38 return base::LaunchUnitTests( |
38 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, | 39 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
39 base::Unretained(&test_suite))); | 40 base::Unretained(&test_suite))); |
40 } | 41 } |
OLD | NEW |