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 15 matching lines...) Expand all Loading... |
26 #include "ui/base/ui_base_paths.h" | 26 #include "ui/base/ui_base_paths.h" |
27 | 27 |
28 #if defined(V8_USE_EXTERNAL_STARTUP_DATA) | 28 #if defined(V8_USE_EXTERNAL_STARTUP_DATA) |
29 #include "gin/v8_initializer.h" | 29 #include "gin/v8_initializer.h" |
30 #endif | 30 #endif |
31 | 31 |
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 "media/base/android/media_jni_registrar.h" | 37 #include "media/base/android/media_jni_registrar.h" |
37 #include "media/capture/video/android/capture_jni_registrar.h" | 38 #include "media/capture/video/android/capture_jni_registrar.h" |
38 #include "net/android/net_jni_registrar.h" | 39 #include "net/android/net_jni_registrar.h" |
39 #include "ui/android/ui_android_jni_registrar.h" | 40 #include "ui/android/ui_android_jni_registrar.h" |
40 #include "ui/base/android/ui_base_jni_registrar.h" | 41 #include "ui/base/android/ui_base_jni_registrar.h" |
41 #include "ui/events/android/events_jni_registrar.h" | 42 #include "ui/events/android/events_jni_registrar.h" |
42 #include "ui/gfx/android/gfx_jni_registrar.h" | 43 #include "ui/gfx/android/gfx_jni_registrar.h" |
43 #include "ui/gl/android/gl_jni_registrar.h" | 44 #include "ui/gl/android/gl_jni_registrar.h" |
44 #endif | 45 #endif |
45 | 46 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 #if defined(V8_USE_EXTERNAL_STARTUP_DATA) | 82 #if defined(V8_USE_EXTERNAL_STARTUP_DATA) |
82 gin::V8Initializer::LoadV8Snapshot(); | 83 gin::V8Initializer::LoadV8Snapshot(); |
83 gin::V8Initializer::LoadV8Natives(); | 84 gin::V8Initializer::LoadV8Natives(); |
84 #endif | 85 #endif |
85 | 86 |
86 #if defined(OS_ANDROID) | 87 #if defined(OS_ANDROID) |
87 // Register JNI bindings for android. | 88 // Register JNI bindings for android. |
88 JNIEnv* env = base::android::AttachCurrentThread(); | 89 JNIEnv* env = base::android::AttachCurrentThread(); |
89 content::android::RegisterCommonJni(env); | 90 content::android::RegisterCommonJni(env); |
90 content::android::RegisterBrowserJni(env); | 91 content::android::RegisterBrowserJni(env); |
| 92 device::android::RegisterGeolocationJni(env); |
91 gfx::android::RegisterJni(env); | 93 gfx::android::RegisterJni(env); |
92 media::RegisterCaptureJni(env); | 94 media::RegisterCaptureJni(env); |
93 media::RegisterJni(env); | 95 media::RegisterJni(env); |
94 net::android::RegisterJni(env); | 96 net::android::RegisterJni(env); |
95 ui::android::RegisterJni(env); | 97 ui::android::RegisterJni(env); |
96 ui::RegisterUIAndroidJni(env); | 98 ui::RegisterUIAndroidJni(env); |
97 ui::gl::android::RegisterJni(env); | 99 ui::gl::android::RegisterJni(env); |
98 ui::events::android::RegisterJni(env); | 100 ui::events::android::RegisterJni(env); |
99 #if !defined(USE_AURA) | 101 #if !defined(USE_AURA) |
100 ui::shell_dialogs::RegisterJni(env); | 102 ui::shell_dialogs::RegisterJni(env); |
(...skipping 19 matching lines...) Expand all Loading... |
120 | 122 |
121 void ContentTestSuiteBase::RegisterInProcessThreads() { | 123 void ContentTestSuiteBase::RegisterInProcessThreads() { |
122 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( | 124 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( |
123 CreateInProcessUtilityThread); | 125 CreateInProcessUtilityThread); |
124 RenderProcessHostImpl::RegisterRendererMainThreadFactory( | 126 RenderProcessHostImpl::RegisterRendererMainThreadFactory( |
125 CreateInProcessRendererThread); | 127 CreateInProcessRendererThread); |
126 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); | 128 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); |
127 } | 129 } |
128 | 130 |
129 } // namespace content | 131 } // namespace content |
OLD | NEW |