Revert "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() {
-  RemoveShellView(java_object_.obj());
+  CloseShellView(java_object_.obj());
+  java_object_.Reset();
   delete this;
 }
 
 // static
 bool Shell::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-// static
-void CloseShell(JNIEnv* env, jclass clazz, jlong shellPtr) {
-  Shell* shell = reinterpret_cast<Shell*>(shellPtr);
-  shell->Close();
-}
-
 }  // namespace content