Reland of Android: support multiple displays on C++ side

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 2aebbb760fcfd3fa433c16cf5bcddf91f946a644..d3f0797b3907007afa02f2c2cdaf92f83fea7927 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -39,6 +39,7 @@
 #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/display/android/jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
@@ -97,6 +98,9 @@ bool EnsureJniRegistered(JNIEnv* env) {
     if (!device::android::RegisterUsbJni(env))
       return false;
 
+    if (!display::RegisterJni(env))

[Tima Vaisburd, 2016/10/27 07:55:58]

Put registration separately from ui::RegisterUIAndroidJni(): is this the right
approach?

+      return false;
+
     if (!media::RegisterJni(env))
       return false;