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 <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 #if defined(OS_ANDROID) | 32 #if defined(OS_ANDROID) |
33 #include "base/android/jni_android.h" | 33 #include "base/android/jni_android.h" |
34 #include "content/browser/android/browser_jni_registrar.h" | 34 #include "content/browser/android/browser_jni_registrar.h" |
35 #include "content/common/android/common_jni_registrar.h" | 35 #include "content/common/android/common_jni_registrar.h" |
36 #include "device/geolocation/android/geolocation_jni_registrar.h" | 36 #include "device/geolocation/android/geolocation_jni_registrar.h" |
37 #include "media/base/android/media_jni_registrar.h" | 37 #include "media/base/android/media_jni_registrar.h" |
38 #include "media/capture/video/android/capture_jni_registrar.h" | 38 #include "media/capture/video/android/capture_jni_registrar.h" |
39 #include "net/android/net_jni_registrar.h" | 39 #include "net/android/net_jni_registrar.h" |
40 #include "ui/android/ui_android_jni_registrar.h" | 40 #include "ui/android/ui_android_jni_registrar.h" |
41 #include "ui/base/android/ui_base_jni_registrar.h" | 41 #include "ui/base/android/ui_base_jni_registrar.h" |
42 #include "ui/events/android/events_jni_registrar.h" | |
43 #include "ui/gfx/android/gfx_jni_registrar.h" | 42 #include "ui/gfx/android/gfx_jni_registrar.h" |
44 #include "ui/gl/android/gl_jni_registrar.h" | 43 #include "ui/gl/android/gl_jni_registrar.h" |
45 #endif | 44 #endif |
46 | 45 |
47 #if defined(OS_ANDROID) && !defined(USE_AURA) | 46 #if defined(OS_ANDROID) && !defined(USE_AURA) |
48 #include "content/public/browser/android/compositor.h" | 47 #include "content/public/browser/android/compositor.h" |
49 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" | 48 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" |
50 #endif | 49 #endif |
51 | 50 |
52 #if defined(USE_OZONE) | 51 #if defined(USE_OZONE) |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 content::android::RegisterCommonJni(env); | 89 content::android::RegisterCommonJni(env); |
91 content::android::RegisterBrowserJni(env); | 90 content::android::RegisterBrowserJni(env); |
92 device::android::RegisterGeolocationJni(env); | 91 device::android::RegisterGeolocationJni(env); |
93 gfx::android::RegisterJni(env); | 92 gfx::android::RegisterJni(env); |
94 media::RegisterCaptureJni(env); | 93 media::RegisterCaptureJni(env); |
95 media::RegisterJni(env); | 94 media::RegisterJni(env); |
96 net::android::RegisterJni(env); | 95 net::android::RegisterJni(env); |
97 ui::android::RegisterJni(env); | 96 ui::android::RegisterJni(env); |
98 ui::RegisterUIAndroidJni(env); | 97 ui::RegisterUIAndroidJni(env); |
99 ui::gl::android::RegisterJni(env); | 98 ui::gl::android::RegisterJni(env); |
100 ui::events::android::RegisterJni(env); | |
101 #if !defined(USE_AURA) | 99 #if !defined(USE_AURA) |
102 ui::shell_dialogs::RegisterJni(env); | 100 ui::shell_dialogs::RegisterJni(env); |
103 content::Compositor::Initialize(); | 101 content::Compositor::Initialize(); |
104 #endif | 102 #endif |
105 #endif | 103 #endif |
106 | 104 |
107 #if defined(USE_OZONE) | 105 #if defined(USE_OZONE) |
108 ui::OzonePlatform::InitializeForUI(); | 106 ui::OzonePlatform::InitializeForUI(); |
109 #endif | 107 #endif |
110 | 108 |
(...skipping 11 matching lines...) Expand all Loading... |
122 | 120 |
123 void ContentTestSuiteBase::RegisterInProcessThreads() { | 121 void ContentTestSuiteBase::RegisterInProcessThreads() { |
124 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( | 122 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( |
125 CreateInProcessUtilityThread); | 123 CreateInProcessUtilityThread); |
126 RenderProcessHostImpl::RegisterRendererMainThreadFactory( | 124 RenderProcessHostImpl::RegisterRendererMainThreadFactory( |
127 CreateInProcessRendererThread); | 125 CreateInProcessRendererThread); |
128 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); | 126 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); |
129 } | 127 } |
130 | 128 |
131 } // namespace content | 129 } // namespace content |
OLD | NEW |