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

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.ui.base;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ skipping 163 matching lines @@
         mContextRef = new WeakReference<Context>(context);
         mOutstandingIntents = new SparseArray<IntentCallback>();
         mIntentErrors = new HashMap<Integer, String>();
         mVSyncMonitor = new VSyncMonitor(context, mVSyncListener);
         mAccessibilityManager = (AccessibilityManager) mApplicationContext.getSystemService(
                 Context.ACCESSIBILITY_SERVICE);
         mDisplayAndroid = DisplayAndroid.getNonMultiDisplay(context);
     }
 
     @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
     private void clearNativePointer() {
         mNativeWindowAndroid = 0;
     }
 
     /**
      * Set the delegate that will handle android permissions requests.
      */
@@ skipping 330 matching lines @@
         }
     }
 
     /**
      * Returns a pointer to the c++ AndroidWindow object and calls the initializer if
      * the object has not been previously initialized.
      * @return A pointer to the c++ AndroidWindow.
      */
     public long getNativePointer() {
         if (mNativeWindowAndroid == 0) {
-            mNativeWindowAndroid = nativeInit(mDisplayAndroid.getSdkDisplayId());
+            mNativeWindowAndroid = nativeInit();
         }
         return mNativeWindowAndroid;
     }
 
     /**
      * Set the animation placeholder view, which we set to 'draw' during animations, such that
      * animations aren't clipped by the SurfaceView 'hole'. This can be the SurfaceView itself
      * or a view directly on top of it. This could be extended to many views if we ever need it.
      */
     public void setAnimationPlaceholderView(View view) {
@@ skipping 121 matching lines @@
      * setWillNotDraw(false) to ensure that the animation is drawn over the SurfaceView,
      * and otherwise we call setWillNotDraw(true).
      */
     private void refreshWillNotDraw() {
         boolean willNotDraw = !mIsTouchExplorationEnabled && mAnimationsOverContent.isEmpty();
         if (mAnimationPlaceholderView.willNotDraw() != willNotDraw) {
             mAnimationPlaceholderView.setWillNotDraw(willNotDraw);
         }
     }
 
-    private native long nativeInit(int displayId);
+    private native long nativeInit();
     private native void nativeOnVSync(long nativeWindowAndroid,
                                       long vsyncTimeMicros,
                                       long vsyncPeriodMicros);
     private native void nativeOnVisibilityChanged(long nativeWindowAndroid, boolean visible);
     private native void nativeOnActivityStopped(long nativeWindowAndroid);
     private native void nativeOnActivityStarted(long nativeWindowAndroid);
     private native void nativeDestroy(long nativeWindowAndroid);
 
 }