Add support for closing Android Shell instances from Java.

content/shell/android/shell_manager.cc

 // Copyright (c) 2012 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/android/shell_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
@@ skipping 16 matching lines @@
 
 base::LazyInstance<GlobalState> g_global_state = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace content {
 
 jobject CreateShellView(Shell* shell) {
   JNIEnv* env = base::android::AttachCurrentThread();
   jobject j_shell_manager = g_global_state.Get().j_shell_manager.obj();
-  return Java_ShellManager_createShell(env, j_shell_manager).Release();
+  return Java_ShellManager_createShell(
+      env,
+      j_shell_manager,
+      reinterpret_cast<intptr_t>(shell)).Release();
 }
 
-void CloseShellView(jobject shell_view) {
+void RemoveShellView(jobject shell_view) {
   JNIEnv* env = base::android::AttachCurrentThread();
   jobject j_shell_manager = g_global_state.Get().j_shell_manager.obj();
-  Java_ShellManager_closeShell(env, j_shell_manager, shell_view);
+  Java_ShellManager_removeShell(env, j_shell_manager, shell_view);
 }
 
 // Register native methods
 bool RegisterShellManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 static void Init(JNIEnv* env, jclass clazz, jobject obj) {
   g_global_state.Get().j_shell_manager.Reset(
       base::android::ScopedJavaLocalRef<jobject>(env, obj));
 }
 
 void LaunchShell(JNIEnv* env, jclass clazz, jstring jurl) {
   ShellBrowserContext* browserContext =
       ShellContentBrowserClient::Get()->browser_context();
   GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
   Shell::CreateNewWindow(browserContext,
                          url,
                          NULL,
                          MSG_ROUTING_NONE,
                          gfx::Size());
 }
 
 }  // namespace content