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

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
index 54d15d3785572fa22a4d39dec67d5ffeb60a39e1..f846f11726e450353acc63e105bc16510a6b51a8 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
@@ -12,12 +12,12 @@ import org.chromium.chrome.browser.autofill.AutofillPopup.AutofillPopupDelegate;
 import org.chromium.chrome.browser.autofill.AutofillSuggestion;
 import org.chromium.chrome.testshell.ChromiumTestShellActivity;
 import org.chromium.chrome.testshell.ChromiumTestShellTestBase;
-import org.chromium.content.browser.ContainerViewDelegate;
 import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.content.browser.test.util.UiUtils;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
-import org.chromium.ui.gfx.ActivityNativeWindow;
+import org.chromium.ui.ViewAndroidDelegate;
+import org.chromium.ui.gfx.ActivityWindowAndroid;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public class AutofillTest extends ChromiumTestShellTestBase {
 
     private AutofillPopup mAutofillPopup;
-    private ActivityNativeWindow mNativeWindow;
+    private ActivityWindowAndroid mWindowAndroid;
     private MockAutofillCallback mMockAutofillCallback;
 
     @Override
@@ -39,14 +39,14 @@ public class AutofillTest extends ChromiumTestShellTestBase {
         waitForActiveShellToBeDoneLoading();
 
         mMockAutofillCallback = new MockAutofillCallback();
-        mNativeWindow = new ActivityNativeWindow(activity);
-        final ContainerViewDelegate viewDelegate =
-                activity.getActiveContentView().getContentViewCore().getContainerViewDelegate();
+        mWindowAndroid = new ActivityWindowAndroid(activity);
+        final ViewAndroidDelegate viewDelegate =
+                activity.getActiveContentView().getContentViewCore().getViewAndroidDelegate();
 
         UiUtils.runOnUiThread(getActivity(), new Runnable() {
             @Override
             public void run() {
-                mAutofillPopup = new AutofillPopup(mNativeWindow,
+                mAutofillPopup = new AutofillPopup(mWindowAndroid,
                         viewDelegate,
                         mMockAutofillCallback);
                 mAutofillPopup.setAnchorRect(50, 500, 500, 50);