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/metrics/statistics_recorder.h" | 10 #include "base/metrics/statistics_recorder.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 #include "gin/v8_initializer.h" // nogncheck | 27 #include "gin/v8_initializer.h" // nogncheck |
28 #endif | 28 #endif |
29 | 29 |
30 #if defined(OS_ANDROID) | 30 #if defined(OS_ANDROID) |
31 #include "base/android/jni_android.h" | 31 #include "base/android/jni_android.h" |
32 #include "content/browser/android/browser_jni_registrar.h" | 32 #include "content/browser/android/browser_jni_registrar.h" |
33 #include "content/common/android/common_jni_registrar.h" | 33 #include "content/common/android/common_jni_registrar.h" |
34 #include "device/geolocation/android/geolocation_jni_registrar.h" | 34 #include "device/geolocation/android/geolocation_jni_registrar.h" |
35 #include "media/base/android/media_jni_registrar.h" | 35 #include "media/base/android/media_jni_registrar.h" |
36 #include "media/capture/video/android/capture_jni_registrar.h" | 36 #include "media/capture/video/android/capture_jni_registrar.h" |
| 37 #include "mojo/android/system/mojo_jni_registrar.h" |
37 #include "net/android/net_jni_registrar.h" | 38 #include "net/android/net_jni_registrar.h" |
38 #include "ui/android/ui_android_jni_registrar.h" | 39 #include "ui/android/ui_android_jni_registrar.h" |
39 #include "ui/base/android/ui_base_jni_registrar.h" | 40 #include "ui/base/android/ui_base_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 #endif | 43 #endif |
43 | 44 |
44 #if defined(OS_ANDROID) && !defined(USE_AURA) | 45 #if defined(OS_ANDROID) && !defined(USE_AURA) |
45 #include "content/public/browser/android/compositor.h" | 46 #include "content/public/browser/android/compositor.h" |
46 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" | 47 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" |
(...skipping 25 matching lines...) Expand all Loading... |
72 | 73 |
73 #if defined(OS_ANDROID) | 74 #if defined(OS_ANDROID) |
74 // Register JNI bindings for android. | 75 // Register JNI bindings for android. |
75 JNIEnv* env = base::android::AttachCurrentThread(); | 76 JNIEnv* env = base::android::AttachCurrentThread(); |
76 content::android::RegisterCommonJni(env); | 77 content::android::RegisterCommonJni(env); |
77 content::android::RegisterBrowserJni(env); | 78 content::android::RegisterBrowserJni(env); |
78 device::android::RegisterGeolocationJni(env); | 79 device::android::RegisterGeolocationJni(env); |
79 gfx::android::RegisterJni(env); | 80 gfx::android::RegisterJni(env); |
80 media::RegisterCaptureJni(env); | 81 media::RegisterCaptureJni(env); |
81 media::RegisterJni(env); | 82 media::RegisterJni(env); |
| 83 mojo::android::RegisterSystemJni(env); |
82 net::android::RegisterJni(env); | 84 net::android::RegisterJni(env); |
83 ui::android::RegisterJni(env); | 85 ui::android::RegisterJni(env); |
84 ui::RegisterUIAndroidJni(env); | 86 ui::RegisterUIAndroidJni(env); |
85 ui::gl::android::RegisterJni(env); | 87 ui::gl::android::RegisterJni(env); |
86 #if !defined(USE_AURA) | 88 #if !defined(USE_AURA) |
87 ui::shell_dialogs::RegisterJni(env); | 89 ui::shell_dialogs::RegisterJni(env); |
88 content::Compositor::Initialize(); | 90 content::Compositor::Initialize(); |
89 #endif | 91 #endif |
90 #endif | 92 #endif |
91 | 93 |
92 ui::MaterialDesignController::Initialize(); | 94 ui::MaterialDesignController::Initialize(); |
93 } | 95 } |
94 | 96 |
95 void ContentTestSuiteBase::RegisterContentSchemes( | 97 void ContentTestSuiteBase::RegisterContentSchemes( |
96 ContentClient* content_client) { | 98 ContentClient* content_client) { |
97 SetContentClient(content_client); | 99 SetContentClient(content_client); |
98 content::RegisterContentSchemes(false); | 100 content::RegisterContentSchemes(false); |
99 SetContentClient(NULL); | 101 SetContentClient(NULL); |
100 } | 102 } |
101 | 103 |
102 void ContentTestSuiteBase::RegisterInProcessThreads() { | 104 void ContentTestSuiteBase::RegisterInProcessThreads() { |
103 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( | 105 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( |
104 CreateInProcessUtilityThread); | 106 CreateInProcessUtilityThread); |
105 RenderProcessHostImpl::RegisterRendererMainThreadFactory( | 107 RenderProcessHostImpl::RegisterRendererMainThreadFactory( |
106 CreateInProcessRendererThread); | 108 CreateInProcessRendererThread); |
107 content::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); | 109 content::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); |
108 } | 110 } |
109 | 111 |
110 } // namespace content | 112 } // namespace content |
OLD | NEW |