Backing out the Quit change which is causing bug 696386. r=mfinkle

embedding/android/GeckoApp.java

@@ -458,8 +458,7 @@ abstract public class GeckoApp
     private void quit() {
         Log.i(LOG_FILE_NAME, "pleaseKillMe");
         rememberLastScreen(true);
-        GeckoAppShell.nativeQuit();
-        finish();
+        System.exit(0);
     }
 
     void handleLocationChange(final int tabId, final String uri) {

embedding/android/GeckoAppShell.java

@@ -110,7 +110,6 @@ public class GeckoAppShell
     // Initialization methods
     public static native void nativeInit();
     public static native void nativeRun(String args);
-    public static native void nativeQuit();
 
     // helper methods
     public static native void setSurfaceView(GeckoSurfaceView sv);

other-licenses/android/APKOpen.cpp

@@ -230,7 +230,6 @@ Java_org_mozilla_gecko_GeckoAppShell_ ## name(JNIEnv *jenv, jclass jc, type1 one
 
 SHELL_WRAPPER0(nativeInit)
 SHELL_WRAPPER1(nativeRun, jstring)
-SHELL_WRAPPER0(nativeQuit)
 SHELL_WRAPPER1(notifyGeckoOfEvent, jobject)
 SHELL_WRAPPER0(processNextNativeEvent)
 SHELL_WRAPPER1(setSurfaceView, jobject)
@@ -636,7 +635,6 @@ loadLibs(const char *apkName)
 #define GETFUNC(name) f_ ## name = (name ## _t) __wrap_dlsym(xul_handle, "Java_org_mozilla_gecko_GeckoAppShell_" #name)
   GETFUNC(nativeInit);
   GETFUNC(nativeRun);
-  GETFUNC(nativeQuit);
   GETFUNC(notifyGeckoOfEvent);
   GETFUNC(processNextNativeEvent);
   GETFUNC(setSurfaceView);

toolkit/xre/nsAndroidStartup.cpp

@@ -54,8 +54,6 @@
 #include "AndroidBridge.h"
 #include "APKOpen.h"
 #include "nsExceptionHandler.h"
-#include "nsIAppStartup.h"
-#include "nsToolkitCompsCID.h"
 
 #define LOG(args...) __android_log_print(ANDROID_LOG_INFO, MOZ_APP_NAME, args)
 
@@ -170,11 +168,3 @@ Java_org_mozilla_gecko_GeckoAppShell_nativeRun(JNIEnv *jenv, jclass jc, jstring
     GeckoStart(args);
 }
 
-extern "C" NS_EXPORT void JNICALL
-Java_org_mozilla_gecko_GeckoAppShell_nativeQuit(JNIEnv*, jclass)
-{
-    nsCOMPtr<nsIAppStartup> appStartup =
-        do_GetService(NS_APPSTARTUP_CONTRACTID);
-    if (appStartup)
-        appStartup->Quit(nsIAppStartup::eAttemptQuit);
-}