Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(427)

Side by Side Diff: content/public/test/content_test_suite_base.cc

Issue 1466463004: Aura on Android: Fix link errors when building content_unittests_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@platform_window_mus
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/app/android/library_loader_hooks.cc ('k') | ui/views/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « content/app/android/library_loader_hooks.cc ('k') | ui/views/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698