[Android] Refactor NativeView to be able to use it for AutofillDialog.

chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

 // Copyright (c) 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.chrome.browser.input;
 
 import android.test.suitebuilder.annotation.LargeTest;
 
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
@@ skipping 59 matching lines @@
         // Once clicked, the popup should show up.
         DOMUtils.clickNode(this, view, viewClient, "select");
         assertTrue("The select popup did not show up on click.",
                 CriteriaHelper.pollForCriteria(new PopupShowingCriteria()));
 
         // Now create and destroy a different ContentView.
         UiUtils.runOnUiThread(getActivity(), new Runnable() {
             @Override
             public void run() {
                 int nativeWebContents = ContentViewUtil.createNativeWebContents(false);
-                WindowAndroid nativeWindow = new WindowAndroid(getActivity());
+                WindowAndroid windowAndroid = new WindowAndroid(getActivity());
                 ContentView contentView = ContentView.newInstance(
                         getActivity(), nativeWebContents,
-                        nativeWindow, ContentView.PERSONALITY_CHROME);
+                        windowAndroid, ContentView.PERSONALITY_CHROME);
                 contentView.destroy();
             }
         });
 
         // Process some more events to give a chance to the dialog to hide if it were to.
         getInstrumentation().waitForIdleSync();
 
         // The popup should still be shown.
         assertNotNull("The select popup got hidden by destroying of unrelated ContentViewCore.",
                 SelectPopupDialog.getCurrent());
     }
 }