Adding NativeWindow base class with no activity.

content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

Index: content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
index 2edf7a2443a95f759783fd816a430bcb7df742ee..f15f269b92ee22a53fedf5f11a48c7da1c6f5b40 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
@@ -15,7 +15,7 @@ import org.chromium.content.app.AppResource;
 import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.common.CommandLine;
-import org.chromium.ui.gfx.NativeWindow;
+import org.chromium.ui.gfx.ActivityNativeWindow;
 
 /**
  * Activity for managing the Content Shell.
@@ -29,6 +29,7 @@ public class ContentShellActivity extends Activity {
     public static final String DEFAULT_SHELL_URL = "http://www.google.com";
 
     private ShellManager mShellManager;
+    private ActivityNativeWindow mActivityNativeWindow;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -43,7 +44,9 @@ public class ContentShellActivity extends Activity {
 
         setContentView(R.layout.content_shell_activity);
         mShellManager = (ShellManager) findViewById(R.id.shell_container);
-        mShellManager.setWindow(new NativeWindow(this));
+        mActivityNativeWindow = new ActivityNativeWindow(this);
+        mActivityNativeWindow.restoreInstanceState(savedInstanceState);
+        mShellManager.setWindow(mActivityNativeWindow);
 
         String startupUrl = getUrlFromIntent(getIntent());
         if (!TextUtils.isEmpty(startupUrl)) {
@@ -67,6 +70,8 @@ public class ContentShellActivity extends Activity {
         if (activeShell != null) {
             outState.putString(ACTIVE_SHELL_URL_KEY, activeShell.getContentView().getUrl());
         }
+
+        mActivityNativeWindow.saveInstanceState(outState);
     }
 
     private void waitForDebuggerIfNeeded() {
@@ -117,6 +122,12 @@ public class ContentShellActivity extends Activity {
         if (view != null) view.onActivityResume();
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        mActivityNativeWindow.onActivityResult(requestCode, resultCode, data);
+    }
+
     private static String getUrlFromIntent(Intent intent) {
         return intent != null ? intent.getDataString() : null;
     }