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