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

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.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.autofill;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.autofill.AutofillPopup;
 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.ViewAndroidDelegate;
 import org.chromium.ui.WindowAndroid;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Tests the Autofill's java code for creating the AutofillPopup object, opening and selecting
  * popups.
  */
 public class AutofillTest extends ChromiumTestShellTestBase {
 
     private AutofillPopup mAutofillPopup;
     private WindowAndroid mWindowAndroid;
     private MockAutofillCallback mMockAutofillCallback;
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
         ChromiumTestShellActivity activity = launchChromiumTestShellWithBlankPage();
         assertNotNull(activity);
         waitForActiveShellToBeDoneLoading();
 
         mMockAutofillCallback = new MockAutofillCallback();
         mWindowAndroid = new WindowAndroid(activity);
-        final ContainerViewDelegate viewDelegate =
-                activity.getActiveContentView().getContentViewCore().getContainerViewDelegate();
+        final ViewAndroidDelegate viewDelegate =
+                activity.getActiveContentView().getContentViewCore().getViewAndroidDelegate();
 
         UiUtils.runOnUiThread(getActivity(), new Runnable() {
             @Override
             public void run() {
                 mAutofillPopup = new AutofillPopup(mWindowAndroid.getContext(),
                         viewDelegate,
                         mMockAutofillCallback);
                 mAutofillPopup.setAnchorRect(50, 500, 500, 50);
             }
         });
@@ skipping 77 matching lines @@
         assertTrue(openAutofillPopupAndWaitUntilReady(suggestions));
         assertEquals(2, mAutofillPopup.getListView().getCount());
 
         TouchCommon touchCommon = new TouchCommon(this);
         touchCommon.singleClickViewRelative(mAutofillPopup.getListView(), 10, 10);
         assertTrue(mMockAutofillCallback.waitForCallback());
 
         assertEquals(0, mMockAutofillCallback.mListIndex);
     }
 }