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/gl/gl_surface.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 "ui/base/android/ui_base_jni_registrar.h" | 17 #include "ui/base/android/ui_base_jni_registrar.h" |
17 #include "ui/gfx/android/gfx_jni_registrar.h" | 18 #include "ui/gfx/android/gfx_jni_registrar.h" |
18 #endif | 19 #endif |
19 | 20 |
20 #if defined(OS_MACOSX) && !defined(OS_IOS) | 21 #if defined(OS_MACOSX) && !defined(OS_IOS) |
21 #include "base/mac/bundle_locations.h" | 22 #include "base/mac/bundle_locations.h" |
22 #include "base/test/mock_chrome_application_mac.h" | 23 #include "base/test/mock_chrome_application_mac.h" |
(...skipping 17 matching lines...) Expand all Loading... |
40 private: | 41 private: |
41 DISALLOW_COPY_AND_ASSIGN(UIBaseTestSuite); | 42 DISALLOW_COPY_AND_ASSIGN(UIBaseTestSuite); |
42 }; | 43 }; |
43 | 44 |
44 UIBaseTestSuite::UIBaseTestSuite(int argc, char** argv) | 45 UIBaseTestSuite::UIBaseTestSuite(int argc, char** argv) |
45 : base::TestSuite(argc, argv) {} | 46 : base::TestSuite(argc, argv) {} |
46 | 47 |
47 void UIBaseTestSuite::Initialize() { | 48 void UIBaseTestSuite::Initialize() { |
48 base::TestSuite::Initialize(); | 49 base::TestSuite::Initialize(); |
49 | 50 |
| 51 #if defined(OS_CHROMEOS) |
| 52 // Needed for the tests in ui/chromeos. |
| 53 // TODO(pkotwicz): Move the tests in ui/chromeos to their own test suite. |
| 54 // (crbug.com/432538) |
| 55 gfx::GLSurface::InitializeOneOffForTests(); |
| 56 #endif |
| 57 |
50 #if defined(OS_WIN) | 58 #if defined(OS_WIN) |
51 gfx::InitDeviceScaleFactor(1.0); | 59 gfx::InitDeviceScaleFactor(1.0); |
52 #endif | 60 #endif |
53 | 61 |
54 #if defined(OS_ANDROID) | 62 #if defined(OS_ANDROID) |
55 // Register JNI bindings for android. | 63 // Register JNI bindings for android. |
56 gfx::android::RegisterJni(base::android::AttachCurrentThread()); | 64 gfx::android::RegisterJni(base::android::AttachCurrentThread()); |
57 ui::android::RegisterJni(base::android::AttachCurrentThread()); | 65 ui::android::RegisterJni(base::android::AttachCurrentThread()); |
58 #endif | 66 #endif |
59 | 67 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 } // namespace | 111 } // namespace |
104 | 112 |
105 int main(int argc, char** argv) { | 113 int main(int argc, char** argv) { |
106 UIBaseTestSuite test_suite(argc, argv); | 114 UIBaseTestSuite test_suite(argc, argv); |
107 | 115 |
108 return base::LaunchUnitTests(argc, | 116 return base::LaunchUnitTests(argc, |
109 argv, | 117 argv, |
110 base::Bind(&UIBaseTestSuite::Run, | 118 base::Bind(&UIBaseTestSuite::Run, |
111 base::Unretained(&test_suite))); | 119 base::Unretained(&test_suite))); |
112 } | 120 } |
OLD | NEW |