aw: Destroy ContentViewCore and WebContents together

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 4bd68b78f36e9b75adc375c53483e595963252bf..dc95b77cc4c4f617bf7f8ba064517b0ee60153ae 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -288,22 +288,7 @@ jlong AwContents::GetWebContents(JNIEnv* env, jobject obj) {
 
 void AwContents::Destroy(JNIEnv* env, jobject obj) {
   java_ref_.reset();
-
-  // We clear the contents_client_bridge_ here so that we break the link with
-  // the java peer. This is important for the popup window case, where we are
-  // swapping AwContents out that share the same java AwContentsClientBridge.
-  // See b/15074651.

[benm (inactive), 2014/10/29 14:56:15]

Can you check the repro case from this internal bug is still fixed?

[boliu, 2014/10/29 15:14:33]

Will do. I'll let you the result afterwards.

[boliu, 2014/10/29 18:51:59]

Not conclusive :(

Nothing appeared wrong when I followed the steps in b/15074651. But then I
reverted this change, and then commented out these two lines and still no
issues, which means I was never able to reproduce the original problem..

-  AwContentsClientBridgeBase::Disassociate(web_contents_.get());
-  contents_client_bridge_.reset();
-
-  // Do not wait until the WebContents are deleted asynchronously to clear
-  // the delegate and stop sending callbacks.
-  web_contents_->SetDelegate(NULL);
-
-  // 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);

[sgurun-gerrit only, 2014/10/31 19:01:43]

Have you tried the condition here? Does it work fine with your changes? (note
that I just saw this and only skimmed it for a few minutes)

[boliu, 2014/10/31 19:49:01]

Not sure what you are asking here. What condition?

[hush (inactive), 2014/10/31 20:58:16]

Will an app that calls WebView#destroy() in ShouldOverrideUrlLoading work after
your patch?

[boliu, 2014/10/31 21:47:05]

I think it's pretty obvious it will work. Will add a test to make certain, as I
can't find the app that does this from code archeology.

+  delete this;
 }
 
 static jlong Init(JNIEnv* env, jclass, jobject browser_context) {