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 "content/public/test/content_test_suite_base.h" | 5 #include "content/public/test/content_test_suite_base.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/metrics/statistics_recorder.h" | 10 #include "base/metrics/statistics_recorder.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 | 30 |
31 #if defined(OS_ANDROID) | 31 #if defined(OS_ANDROID) |
32 #include "base/android/jni_android.h" | 32 #include "base/android/jni_android.h" |
33 #include "content/browser/android/browser_jni_registrar.h" | 33 #include "content/browser/android/browser_jni_registrar.h" |
34 #include "content/common/android/common_jni_registrar.h" | 34 #include "content/common/android/common_jni_registrar.h" |
35 #include "content/public/browser/android/compositor.h" | 35 #include "content/public/browser/android/compositor.h" |
36 #include "media/base/android/media_jni_registrar.h" | 36 #include "media/base/android/media_jni_registrar.h" |
37 #include "net/android/net_jni_registrar.h" | 37 #include "net/android/net_jni_registrar.h" |
38 #include "ui/android/ui_android_jni_registrar.h" | 38 #include "ui/android/ui_android_jni_registrar.h" |
39 #include "ui/base/android/ui_base_jni_registrar.h" | 39 #include "ui/base/android/ui_base_jni_registrar.h" |
| 40 #include "ui/events/android/events_jni_registrar.h" |
40 #include "ui/gfx/android/gfx_jni_registrar.h" | 41 #include "ui/gfx/android/gfx_jni_registrar.h" |
41 #include "ui/gl/android/gl_jni_registrar.h" | 42 #include "ui/gl/android/gl_jni_registrar.h" |
42 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" | 43 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" |
43 #endif | 44 #endif |
44 | 45 |
45 #if defined(USE_OZONE) | 46 #if defined(USE_OZONE) |
46 #include "ui/ozone/public/ozone_platform.h" | 47 #include "ui/ozone/public/ozone_platform.h" |
47 #endif | 48 #endif |
48 | 49 |
49 | 50 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 // Register JNI bindings for android. | 82 // Register JNI bindings for android. |
82 JNIEnv* env = base::android::AttachCurrentThread(); | 83 JNIEnv* env = base::android::AttachCurrentThread(); |
83 content::android::RegisterCommonJni(env); | 84 content::android::RegisterCommonJni(env); |
84 content::android::RegisterBrowserJni(env); | 85 content::android::RegisterBrowserJni(env); |
85 gfx::android::RegisterJni(env); | 86 gfx::android::RegisterJni(env); |
86 media::RegisterJni(env); | 87 media::RegisterJni(env); |
87 net::android::RegisterJni(env); | 88 net::android::RegisterJni(env); |
88 ui::android::RegisterJni(env); | 89 ui::android::RegisterJni(env); |
89 ui::RegisterUIAndroidJni(env); | 90 ui::RegisterUIAndroidJni(env); |
90 ui::gl::android::RegisterJni(env); | 91 ui::gl::android::RegisterJni(env); |
| 92 ui::events::android::RegisterJni(env); |
91 ui::shell_dialogs::RegisterJni(env); | 93 ui::shell_dialogs::RegisterJni(env); |
92 | 94 |
93 content::Compositor::Initialize(); | 95 content::Compositor::Initialize(); |
94 #endif | 96 #endif |
95 | 97 |
96 #if defined(USE_OZONE) | 98 #if defined(USE_OZONE) |
97 ui::OzonePlatform::InitializeForUI(); | 99 ui::OzonePlatform::InitializeForUI(); |
98 #endif | 100 #endif |
99 | 101 |
100 testing::UnitTest::GetInstance()->listeners().Append( | 102 testing::UnitTest::GetInstance()->listeners().Append( |
(...skipping 11 matching lines...) Expand all Loading... |
112 #if !defined(OS_IOS) | 114 #if !defined(OS_IOS) |
113 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( | 115 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( |
114 CreateInProcessUtilityThread); | 116 CreateInProcessUtilityThread); |
115 RenderProcessHostImpl::RegisterRendererMainThreadFactory( | 117 RenderProcessHostImpl::RegisterRendererMainThreadFactory( |
116 CreateInProcessRendererThread); | 118 CreateInProcessRendererThread); |
117 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); | 119 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); |
118 #endif | 120 #endif |
119 } | 121 } |
120 | 122 |
121 } // namespace content | 123 } // namespace content |
OLD | NEW |