| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/test/launcher/unit_test_launcher.h" | 8 #include "base/test/launcher/unit_test_launcher.h" |
| 9 #include "base/test/test_suite.h" | 9 #include "base/test/test_suite.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "ui/base/resource/resource_bundle.h" | 11 #include "ui/base/resource/resource_bundle.h" |
| 12 #include "ui/base/ui_base_paths.h" | 12 #include "ui/base/ui_base_paths.h" |
| 13 #include "ui/gfx/gfx_paths.h" | 13 #include "ui/gfx/gfx_paths.h" |
| 14 #include "ui/gl/gl_surface.h" |
| 14 | 15 |
| 15 #if defined(OS_ANDROID) | 16 #if defined(OS_ANDROID) |
| 16 #include "base/android/jni_android.h" | 17 #include "base/android/jni_android.h" |
| 17 #include "ui/base/android/ui_base_jni_registrar.h" | 18 #include "ui/base/android/ui_base_jni_registrar.h" |
| 18 #include "ui/gfx/android/gfx_jni_registrar.h" | 19 #include "ui/gfx/android/gfx_jni_registrar.h" |
| 19 #endif | 20 #endif |
| 20 | 21 |
| 21 #if defined(OS_MACOSX) && !defined(OS_IOS) | 22 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 22 #include "base/mac/bundle_locations.h" | 23 #include "base/mac/bundle_locations.h" |
| 23 #endif | 24 #endif |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 #if defined(OS_MACOSX) && !defined(OS_IOS) | 87 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 87 base::mac::SetOverrideFrameworkBundle(NULL); | 88 base::mac::SetOverrideFrameworkBundle(NULL); |
| 88 #endif | 89 #endif |
| 89 base::TestSuite::Shutdown(); | 90 base::TestSuite::Shutdown(); |
| 90 } | 91 } |
| 91 | 92 |
| 92 } // namespace | 93 } // namespace |
| 93 | 94 |
| 94 int main(int argc, char** argv) { | 95 int main(int argc, char** argv) { |
| 95 UIBaseTestSuite test_suite(argc, argv); | 96 UIBaseTestSuite test_suite(argc, argv); |
| 97 gfx::GLSurface::InitializeOneOffForTests(); |
| 96 | 98 |
| 97 return base::LaunchUnitTests(argc, | 99 return base::LaunchUnitTests(argc, |
| 98 argv, | 100 argv, |
| 99 base::Bind(&UIBaseTestSuite::Run, | 101 base::Bind(&UIBaseTestSuite::Run, |
| 100 base::Unretained(&test_suite))); | 102 base::Unretained(&test_suite))); |
| 101 } | 103 } |
| OLD | NEW |