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/test/launcher/unit_test_launcher.h" | 6 #include "base/test/launcher/unit_test_launcher.h" |
7 #include "content/app/mojo/mojo_init.h" | 7 #include "content/app/mojo/mojo_init.h" |
8 #include "content/public/test/unittest_test_suite.h" | 8 #include "content/public/test/unittest_test_suite.h" |
9 #include "content/test/content_test_suite.h" | 9 #include "content/test/content_test_suite.h" |
10 | 10 |
11 #if defined(OS_ANDROID) | 11 #if defined(OS_ANDROID) |
12 #include "base/android/jni_android.h" | 12 #include "base/android/jni_android.h" |
13 #include "base/test/test_file_util.h" | 13 #include "base/test/test_file_util.h" |
14 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 14 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
15 #endif | 15 #endif |
16 | 16 |
17 int main(int argc, char** argv) { | 17 int main(int argc, char** argv) { |
18 #if defined(OS_ANDROID) | 18 #if defined(OS_ANDROID) |
19 // Register JNI bindings for android. | 19 // Register JNI bindings for android. |
20 base::RegisterContentUriTestUtils(base::android::AttachCurrentThread()); | 20 base::RegisterContentUriTestUtils(base::android::AttachCurrentThread()); |
21 #endif | 21 #endif |
| 22 content::UnitTestTestSuite test_suite( |
| 23 new content::ContentTestSuite(argc, argv)); |
22 #if !defined(OS_IOS) | 24 #if !defined(OS_IOS) |
23 content::InitializeMojo(); | 25 content::InitializeMojo(); |
24 #endif | 26 #endif |
25 content::UnitTestTestSuite test_suite( | |
26 new content::ContentTestSuite(argc, argv)); | |
27 | 27 |
28 return base::LaunchUnitTests( | 28 return base::LaunchUnitTests( |
29 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, | 29 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
30 base::Unretained(&test_suite))); | 30 base::Unretained(&test_suite))); |
31 } | 31 } |
OLD | NEW |