| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 | 83 |
| 84 #if defined(OS_ANDROID) | 84 #if defined(OS_ANDROID) |
| 85 // Register JNI bindings for android. | 85 // Register JNI bindings for android. |
| 86 JNIEnv* env = base::android::AttachCurrentThread(); | 86 JNIEnv* env = base::android::AttachCurrentThread(); |
| 87 content::android::RegisterCommonJni(env); | 87 content::android::RegisterCommonJni(env); |
| 88 content::android::RegisterBrowserJni(env); | 88 content::android::RegisterBrowserJni(env); |
| 89 gfx::android::RegisterJni(env); | 89 gfx::android::RegisterJni(env); |
| 90 media::RegisterJni(env); | 90 media::RegisterJni(env); |
| 91 net::android::RegisterJni(env); | 91 net::android::RegisterJni(env); |
| 92 ui::android::RegisterJni(env); | 92 ui::android::RegisterJni(env); |
| 93 ui::RegisterUIAndroidJni(env); | |
| 94 ui::gl::android::RegisterJni(env); | 93 ui::gl::android::RegisterJni(env); |
| 95 ui::events::android::RegisterJni(env); | 94 ui::events::android::RegisterJni(env); |
| 96 #if !defined(USE_AURA) | 95 #if !defined(USE_AURA) |
| 96 ui::RegisterUIAndroidJni(env); |
| 97 ui::shell_dialogs::RegisterJni(env); | 97 ui::shell_dialogs::RegisterJni(env); |
| 98 content::Compositor::Initialize(); | 98 content::Compositor::Initialize(); |
| 99 #endif | 99 #endif |
| 100 #endif | 100 #endif |
| 101 | 101 |
| 102 #if defined(USE_OZONE) | 102 #if defined(USE_OZONE) |
| 103 ui::OzonePlatform::InitializeForUI(); | 103 ui::OzonePlatform::InitializeForUI(); |
| 104 #endif | 104 #endif |
| 105 | 105 |
| 106 testing::UnitTest::GetInstance()->listeners().Append( | 106 testing::UnitTest::GetInstance()->listeners().Append( |
| (...skipping 11 matching lines...) Expand all Loading... |
| 118 #if !defined(OS_IOS) | 118 #if !defined(OS_IOS) |
| 119 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( | 119 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( |
| 120 CreateInProcessUtilityThread); | 120 CreateInProcessUtilityThread); |
| 121 RenderProcessHostImpl::RegisterRendererMainThreadFactory( | 121 RenderProcessHostImpl::RegisterRendererMainThreadFactory( |
| 122 CreateInProcessRendererThread); | 122 CreateInProcessRendererThread); |
| 123 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); | 123 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); |
| 124 #endif | 124 #endif |
| 125 } | 125 } |
| 126 | 126 |
| 127 } // namespace content | 127 } // namespace content |
| OLD | NEW |