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

ui/android/window_android.cc

Index: ui/android/window_android.cc
diff --git a/ui/android/window_android.cc b/ui/android/window_android.cc
index 7e40c8fb62e0ef658b1e094877498b12a4221c7b..cff32ba6f571def1c787cd219296027d86f1cbc8 100644
--- a/ui/android/window_android.cc
+++ b/ui/android/window_android.cc
@@ -21,7 +21,8 @@ using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
-WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) : compositor_(NULL) {
+WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, int display_id)
+    : display_id_(display_id), compositor_(NULL) {
   java_window_.Reset(env, obj);
 }
 
@@ -46,8 +47,8 @@ WindowAndroid::~WindowAndroid() {
 WindowAndroid* WindowAndroid::CreateForTesting() {
   JNIEnv* env = AttachCurrentThread();
   const JavaRef<jobject>& context = base::android::GetApplicationContext();
-  return new WindowAndroid(
-      env, Java_WindowAndroid_createForTesting(env, context).obj());
+  long native_pointer = Java_WindowAndroid_createForTesting(env, context);
+  return reinterpret_cast<WindowAndroid*>(native_pointer);
 }
 
 void WindowAndroid::DestroyForTesting() {
@@ -154,8 +155,8 @@ WindowAndroid* WindowAndroid::GetWindowAndroid() const {
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
-jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
-  WindowAndroid* window = new WindowAndroid(env, obj);
+jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) {
+  WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id);
   return reinterpret_cast<intptr_t>(window);
 }