Upstream ResourceManager

content/app/android/library_loader_hooks.cc

Index: content/app/android/library_loader_hooks.cc
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index d09e21e96224e1e96312fdd9c0c9e9520755284c..d044e6b1e02e7d94ba7ee557e65f801a00ce28cc 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -25,6 +25,7 @@
 #include "device/battery/android/battery_jni_registrar.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"
@@ -69,6 +70,9 @@ bool EnsureJniRegistered(JNIEnv* env) {
     if (!media::RegisterJni(env))
       return false;
 
+    if (!ui::RegisterUIAndroidJni(env))
+      return false;
+
     g_jni_init_done = true;
   }