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

Unified Diff: content/public/test/content_test_suite_base.cc

Issue 701033005: content: Move type selection logic out of GpuMemoryBufferImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review feedback Created 6 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/content_tests.gypi ('k') | no next file » | 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 9b11678ebcc997c6c6ef3a0f4eac66b5db4913b2..4144d3059b155f9488b9563a5fedb879cfd49efc 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -37,6 +37,10 @@
#include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
#endif
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
#include "gin/public/isolate_holder.h"
#endif
@@ -79,9 +83,14 @@ void ContentTestSuiteBase::Initialize() {
media::RegisterJni(env);
net::android::RegisterJni(env);
ui::android::RegisterJni(env);
+ ui::gl::android::RegisterJni(env);
ui::shell_dialogs::RegisterJni(env);
#endif
+#if defined(USE_OZONE)
+ ui::OzonePlatform::InitializeForUI();
+#endif
+
testing::UnitTest::GetInstance()->listeners().Append(
new ContentTestSuiteBaseListener);
}
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698