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

content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
index f72d1fb3fd154e678d2762a230f104568e029331..523e135cb573dad0468e718ba286b050c958e2f3 100644
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
@@ -26,7 +26,7 @@ import org.chromium.content.common.CommandLine;
 import org.chromium.content.common.ProcessInitException;
 import org.chromium.content_shell.Shell;
 import org.chromium.content_shell.ShellManager;
-import org.chromium.ui.gfx.ActivityNativeWindow;
+import org.chromium.ui.gfx.ActivityWindowAndroid;
 
 /**
  * Activity for managing the Content Shell.
@@ -44,7 +44,7 @@ public class ContentShellActivity extends ChromiumActivity {
     public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";
 
     private ShellManager mShellManager;
-    private ActivityNativeWindow mActivityNativeWindow;
+    private ActivityWindowAndroid mActivityWindowAndroid;
     private BroadcastReceiver mReceiver;
 
     @Override
@@ -67,9 +67,9 @@ public class ContentShellActivity extends ChromiumActivity {
 
             setContentView(R.layout.content_shell_activity);
             mShellManager = (ShellManager) findViewById(R.id.shell_container);
-            mActivityNativeWindow = new ActivityNativeWindow(this);
-            mActivityNativeWindow.restoreInstanceState(savedInstanceState);
-            mShellManager.setWindow(mActivityNativeWindow);
+            mActivityWindowAndroid = new ActivityWindowAndroid(this);
+            mActivityWindowAndroid.restoreInstanceState(savedInstanceState);
+            mShellManager.setWindow(mActivityWindowAndroid);
             ContentVideoView.registerContentVideoViewContextDelegate(
                     new ActivityContentVideoViewDelegate(this));
 
@@ -99,7 +99,7 @@ public class ContentShellActivity extends ChromiumActivity {
             outState.putString(ACTIVE_SHELL_URL_KEY, activeShell.getContentView().getUrl());
         }
 
-        mActivityNativeWindow.saveInstanceState(outState);
+        mActivityWindowAndroid.saveInstanceState(outState);
     }
 
     private void waitForDebuggerIfNeeded() {
@@ -179,7 +179,7 @@ public class ContentShellActivity extends ChromiumActivity {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        mActivityNativeWindow.onActivityResult(requestCode, resultCode, data);
+        mActivityWindowAndroid.onActivityResult(requestCode, resultCode, data);
     }
 
     private static String getUrlFromIntent(Intent intent) {