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

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 f517d30c9ca7e955f82b57ea81349b145d1ef106..82ae2fb6519edd988dfaa4919bd7ce99c036abc6 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -37,6 +37,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"
 #endif
@@ -76,6 +77,7 @@ void ContentTestSuiteBase::Initialize() {
   content::android::RegisterCommonJni(env);
   content::android::RegisterBrowserJni(env);
   device::android::RegisterGeolocationJni(env);
+  display::RegisterJni(env);
   gfx::android::RegisterJni(env);
   media::RegisterCaptureJni(env);
   media::RegisterJni(env);