Upstream ResourceManager

content/public/test/content_test_suite_base.cc

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 afaeea70af81fa19bbbec841fdf31874c43f9d8f..81821b00dbbf3c25ea6a46ae08892b1a48cb31ca 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -32,6 +32,7 @@
 #include "content/public/browser/android/compositor.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
+#include "ui/android/ui_android_jni_registrar.h"
 #include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
@@ -84,6 +85,7 @@ void ContentTestSuiteBase::Initialize() {
   media::RegisterJni(env);
   net::android::RegisterJni(env);
   ui::android::RegisterJni(env);
+  ui::RegisterUIAndroidJni(env);
   ui::gl::android::RegisterJni(env);
   ui::shell_dialogs::RegisterJni(env);