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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/content_test_suite_base.cc
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index 859e60d80a30a8ced248603efcfe4ff0a6f54fd7..b81448f84608263ff170e72059ff9accb166c8f7 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -90,10 +90,10 @@ void ContentTestSuiteBase::Initialize() {
media::RegisterJni(env);
net::android::RegisterJni(env);
ui::android::RegisterJni(env);
- ui::RegisterUIAndroidJni(env);
ui::gl::android::RegisterJni(env);
ui::events::android::RegisterJni(env);
#if !defined(USE_AURA)
+ ui::RegisterUIAndroidJni(env);
ui::shell_dialogs::RegisterJni(env);
content::Compositor::Initialize();
#endif
« 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