| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 | 72 |
| 73 #if defined(OS_ANDROID) | 73 #if defined(OS_ANDROID) |
| 74 // Register JNI bindings for android. | 74 // Register JNI bindings for android. |
| 75 JNIEnv* env = base::android::AttachCurrentThread(); | 75 JNIEnv* env = base::android::AttachCurrentThread(); |
| 76 content::android::RegisterCommonJni(env); | 76 content::android::RegisterCommonJni(env); |
| 77 content::android::RegisterBrowserJni(env); | 77 content::android::RegisterBrowserJni(env); |
| 78 gfx::android::RegisterJni(env); | 78 gfx::android::RegisterJni(env); |
| 79 media::RegisterJni(env); | 79 media::RegisterJni(env); |
| 80 net::android::RegisterJni(env); | 80 net::android::RegisterJni(env); |
| 81 ui::android::RegisterJni(env); | 81 ui::android::RegisterJni(env); |
| 82 ui::gl::android::RegisterJni(env); |
| 82 ui::shell_dialogs::RegisterJni(env); | 83 ui::shell_dialogs::RegisterJni(env); |
| 83 #endif | 84 #endif |
| 84 | 85 |
| 85 testing::UnitTest::GetInstance()->listeners().Append( | 86 testing::UnitTest::GetInstance()->listeners().Append( |
| 86 new ContentTestSuiteBaseListener); | 87 new ContentTestSuiteBaseListener); |
| 87 } | 88 } |
| 88 | 89 |
| 89 void ContentTestSuiteBase::RegisterContentSchemes( | 90 void ContentTestSuiteBase::RegisterContentSchemes( |
| 90 ContentClient* content_client) { | 91 ContentClient* content_client) { |
| 91 SetContentClient(content_client); | 92 SetContentClient(content_client); |
| 92 content::RegisterContentSchemes(false); | 93 content::RegisterContentSchemes(false); |
| 93 SetContentClient(NULL); | 94 SetContentClient(NULL); |
| 94 } | 95 } |
| 95 | 96 |
| 96 void ContentTestSuiteBase::RegisterInProcessThreads() { | 97 void ContentTestSuiteBase::RegisterInProcessThreads() { |
| 97 #if !defined(OS_IOS) | 98 #if !defined(OS_IOS) |
| 98 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( | 99 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( |
| 99 CreateInProcessUtilityThread); | 100 CreateInProcessUtilityThread); |
| 100 RenderProcessHostImpl::RegisterRendererMainThreadFactory( | 101 RenderProcessHostImpl::RegisterRendererMainThreadFactory( |
| 101 CreateInProcessRendererThread); | 102 CreateInProcessRendererThread); |
| 102 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); | 103 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); |
| 103 #endif | 104 #endif |
| 104 } | 105 } |
| 105 | 106 |
| 106 } // namespace content | 107 } // namespace content |
| OLD | NEW |