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

ui/android/java/src/org/chromium/ui/base/WindowAndroid.java

Index: ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
diff --git a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
index bb9f7dceea4c73a667765590d6b737f3c86e809e..7fc6180aecdd009f0fe60a5ac36847a175630ead 100644
--- a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
@@ -181,12 +181,8 @@
     }
 
     @CalledByNative
-    private static long createForTesting(Context context) {
-        WindowAndroid windowAndroid = new WindowAndroid(context);
-        // |windowAndroid.getNativePointer()| creates native WindowAndroid object
-        // which stores a global ref to |windowAndroid|. Therefore |windowAndroid|
-        // is not immediately eligible for gc.
-        return windowAndroid.getNativePointer();
+    private static WindowAndroid createForTesting(Context context) {
+        return new WindowAndroid(context);
     }
 
     @CalledByNative
@@ -537,7 +533,7 @@
      */
     public long getNativePointer() {
         if (mNativeWindowAndroid == 0) {
-            mNativeWindowAndroid = nativeInit(mDisplayAndroid.getSdkDisplayId());
+            mNativeWindowAndroid = nativeInit();
         }
         return mNativeWindowAndroid;
     }
@@ -679,7 +675,7 @@
         }
     }
 
-    private native long nativeInit(int displayId);
+    private native long nativeInit();
     private native void nativeOnVSync(long nativeWindowAndroid,
                                       long vsyncTimeMicros,
                                       long vsyncPeriodMicros);