Upstream ShouldOverrideUrlLoading changes

android_webview/native/aw_contents.cc

 // Copyright 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 "android_webview/native/aw_contents.h"
 
 #include <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 288 matching lines @@
     icon_helper_->SetListener(NULL);
   base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, -1);
 }
 
 jint AwContents::GetWebContents(JNIEnv* env, jobject obj) {
   DCHECK(web_contents_);
   return reinterpret_cast<jint>(web_contents_.get());
 }
 
 void AwContents::Destroy(JNIEnv* env, jobject obj) {
-  delete this;
-
+  java_ref_.reset();
+  // We do not delete AwContents immediately. Some applications try to delete
+  // Webview in ShouldOverrideUrlLoading callback, which is a sync IPC from
+  // Webkit.
+  BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this);
   // When the last WebView is destroyed free all discardable memory allocated by
   // Chromium, because the app process may continue to run for a long time
   // without ever using another WebView.
   if (base::subtle::NoBarrier_Load(&g_instance_count) == 0) {

[joth, 2013/10/09 02:22:40]

now the delete is delayed, this must be moved to the d'tor, after the decrement
actually happened.

[sgurun-gerrit only, 2013/10/16 21:49:28]

Done.

     base::MemoryPressureListener::NotifyMemoryPressure(
         base::MemoryPressureListener::MEMORY_PRESSURE_CRITICAL);
   }
 }
 
 static jint Init(JNIEnv* env, jclass, jobject browser_context) {
   // TODO(joth): Use |browser_context| to get the native BrowserContext, rather
   // than hard-code the default instance lookup here.
   scoped_ptr<WebContents> web_contents(content::WebContents::Create(
       content::WebContents::CreateParams(AwBrowserContext::GetDefault())));
@@ skipping 581 matching lines @@
 
 void AwContents::TrimMemory(JNIEnv* env, jobject obj, jint level) {
   browser_view_renderer_->TrimMemory(level);
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview