Add ContextMenu support upstream for Android

chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
index 641b4020fbb9f403d4f0089f3a2588abe5b4f983..62d8abac8e9e239606f02e5269134f1bde49e67a 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.appmenu.AppMenuHandler;
 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.printing.PrintingControllerFactory;
 import org.chromium.chrome.browser.printing.TabPrinter;
+import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.testshell.sync.SyncController;
 import org.chromium.content.browser.ActivityContentVideoViewClient;
 import org.chromium.content.browser.BrowserStartupController;
@@ -100,6 +101,7 @@ public class ChromiumTestShellActivity extends Activity implements AppMenuProper
         TestShellToolbar mToolbar = (TestShellToolbar) findViewById(R.id.toolbar);
         mAppMenuHandler = new AppMenuHandler(this, this, R.menu.main_menu);
         mToolbar.setMenuHandler(mAppMenuHandler);
+
         mDevToolsServer = new DevToolsServer("chromium_testshell");
         mDevToolsServer.setRemoteDebuggingEnabled(true);
 
@@ -123,7 +125,7 @@ public class ChromiumTestShellActivity extends Activity implements AppMenuProper
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         // TODO(dtrainor): Save/restore the tab state.
-        mWindow.saveInstanceState(outState);
+        if (mWindow != null) mWindow.saveInstanceState(outState);
     }
 
     @Override