Add support for closing Android Shell instances from Java.

content/shell/browser/shell_android.cc

 // Copyright 2013 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.
 
 #include "content/shell/browser/shell.h"
 
 #include <jni.h>
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 12 matching lines @@
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   DCHECK(command_line->HasSwitch(switches::kForceCompositingMode));
   DCHECK(command_line->HasSwitch(switches::kEnableThreadedCompositing));
 }
 
 void Shell::PlatformExit() {
 }
 
 void Shell::PlatformCleanUp() {
+  JNIEnv* env = AttachCurrentThread();
+  if (java_object_.is_null())
+    return;
+  Java_Shell_onNativeDestroyed(env, java_object_.obj());
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
 }
 
 void Shell::PlatformSetAddressBarURL(const GURL& url) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_url = ConvertUTF8ToJavaString(env, url.spec());
   Java_Shell_onUpdateUrl(env, java_object_.obj(), j_url.obj());
 }
@@ skipping 33 matching lines @@
       env, java_object_.obj(), enter_fullscreen);
 }
 
 bool Shell::PlatformIsFullscreenForTabOrPending(
     const WebContents* web_contents) const {
   JNIEnv* env = AttachCurrentThread();
   return Java_Shell_isFullscreenForTabOrPending(env, java_object_.obj());
 }
 
 void Shell::Close() {
-  CloseShellView(java_object_.obj());
-  java_object_.Reset();
+  RemoveShellView(java_object_.obj());
   delete this;
 }
 
 // static
 bool Shell::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
+// static
+void CloseShell(JNIEnv* env, jclass clazz, jlong nativeShell) {

[cjhopman, 2014/01/09 02:12:44]

This function should be generated by the jni generator. Looks like content_shell
jni doesn't yet use longs for pointers so that's why this isn't autogenerating.

[Ted C, 2014/01/09 02:46:32]

Oh Chris, how you got my hopes and dashed them so well.

Sadly, the generator will convert the Java side of:
static native void nativeClose(long nativeShell)

to:
static void Close(JNIEnv* env, jobject jcaller,
    jlong nativeShell) {
  Shell* native = reinterpret_cast<Shell*>(nativeShell);
  CHECK_NATIVE_PTR(env, jcaller, native, "Close");
  return native->Close(env, jcaller);
}

It's so close, but would need it to drop the env and jcaller params and allow
it to directly call non-java aware native functions (which would be amazing
BTW).  Since I don't want to pollute the cross platform shell.h with a bunch
of JNI bridging cruft, I would like to keep it isolated to this file and keep
it much like it was.

+  Shell* shell = reinterpret_cast<Shell*>(nativeShell);
+  shell->Close();
+}
+
 }  // namespace content