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 "ui/test/test_suite.h" | 5 #include "ui/test/test_suite.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
11 #include "ui/base/resource/resource_handle.h" | 11 #include "ui/base/resource/resource_handle.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 | 14 |
15 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
16 #include "base/android/jni_android.h" | 16 #include "base/android/jni_android.h" |
17 #include "ui/android/ui_jni_registrar.h" | 17 #include "ui/android/ui_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 #endif | 23 #endif |
23 | 24 |
24 namespace ui { | 25 namespace ui { |
25 namespace test { | 26 namespace test { |
26 | 27 |
27 UITestSuite::UITestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} | 28 UITestSuite::UITestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} |
28 | 29 |
29 void UITestSuite::Initialize() { | 30 void UITestSuite::Initialize() { |
30 base::TestSuite::Initialize(); | 31 base::TestSuite::Initialize(); |
31 | 32 |
32 #if defined(OS_ANDROID) | 33 #if defined(OS_ANDROID) |
33 // Register JNI bindings for android. | 34 // Register JNI bindings for android. |
| 35 gfx::android::RegisterJni(base::android::AttachCurrentThread()); |
34 ui::android::RegisterJni(base::android::AttachCurrentThread()); | 36 ui::android::RegisterJni(base::android::AttachCurrentThread()); |
35 #endif | 37 #endif |
36 | 38 |
37 ui::RegisterPathProvider(); | 39 ui::RegisterPathProvider(); |
38 gfx::RegisterPathProvider(); | 40 gfx::RegisterPathProvider(); |
39 | 41 |
40 #if defined(OS_MACOSX) && !defined(OS_IOS) | 42 #if defined(OS_MACOSX) && !defined(OS_IOS) |
41 // Look in the framework bundle for resources. | 43 // Look in the framework bundle for resources. |
42 // TODO(port): make a resource bundle for non-app exes. What's done here | 44 // TODO(port): make a resource bundle for non-app exes. What's done here |
43 // isn't really right because this code needs to depend on chrome_dll | 45 // isn't really right because this code needs to depend on chrome_dll |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 ui::ResourceBundle::CleanupSharedInstance(); | 80 ui::ResourceBundle::CleanupSharedInstance(); |
79 | 81 |
80 #if defined(OS_MACOSX) && !defined(OS_IOS) | 82 #if defined(OS_MACOSX) && !defined(OS_IOS) |
81 base::mac::SetOverrideFrameworkBundle(NULL); | 83 base::mac::SetOverrideFrameworkBundle(NULL); |
82 #endif | 84 #endif |
83 base::TestSuite::Shutdown(); | 85 base::TestSuite::Shutdown(); |
84 } | 86 } |
85 | 87 |
86 } // namespace test | 88 } // namespace test |
87 } // namespace ui | 89 } // namespace ui |
OLD | NEW |