Deliver onRenderProcessGone to WebLayer embedders

Discussion:
https://docs.google.com/document/d/1M-ocVxRpj43fGrM4mdBazEgcDa0nbWPxD_NxfsPnrkg/edit?ts=5dc96bc9

This CL implements the short-term solution, i.e. only an onRenderProcessGone
callback.

Change-Id: I51cf71975db4d72e940e15b5f2acca6cde3ff4a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1901083Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Tobias Sargeant <tobiasjs@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Pavel Shmakov <pshmakov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714501}

weblayer/browser/java/org/chromium/weblayer_private/TabCallbackProxy.java

@@ -36,6 +36,11 @@ public final class TabCallbackProxy {
         mClient.visibleUrlChanged(string);
     }
 
+    @CalledByNative
+    private void onRenderProcessGone() throws RemoteException {
+        mClient.onRenderProcessGone();
+    }
+
     @NativeMethods
     interface Natives {
         long createTabCallbackProxy(TabCallbackProxy proxy, long tab);

weblayer/browser/java/org/chromium/weblayer_private/interfaces/ITabClient.aidl

@@ -12,4 +12,6 @@ interface ITabClient {
   void visibleUrlChanged(in String url) = 0;
 
   void onNewTab(in int tabId, in int mode) = 1;
+
+  void onRenderProcessGone() = 2;
 }

weblayer/browser/tab_callback_proxy.cc

@@ -31,6 +31,11 @@ void TabCallbackProxy::DisplayedUrlChanged(const GURL& url) {
   Java_TabCallbackProxy_visibleUrlChanged(env, java_observer_, jstring_url);
 }
 
+void TabCallbackProxy::OnRenderProcessGone() {
+  Java_TabCallbackProxy_onRenderProcessGone(AttachCurrentThread(),
+                                            java_observer_);
+}
+
 static jlong JNI_TabCallbackProxy_CreateTabCallbackProxy(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& proxy,

weblayer/browser/tab_callback_proxy.h

@@ -25,6 +25,8 @@ class TabCallbackProxy : public TabObserver {
   // BrowserObserver:
   void DisplayedUrlChanged(const GURL& url) override;
 
+  void OnRenderProcessGone() override;
+
  private:
   Tab* tab_;
   base::android::ScopedJavaGlobalRef<jobject> java_observer_;

weblayer/browser/tab_impl.cc

@@ -362,6 +362,12 @@ void TabImpl::DidFinishNavigation(
 #endif
 }
 
+void TabImpl::RenderProcessGone(base::TerminationStatus status) {
+  for (auto& observer : observers_) {
+    observer.OnRenderProcessGone();
+  }
+}
+
 void TabImpl::OnExitFullscreen() {
   // If |processing_enter_fullscreen_| is true, it means the callback is being
   // called while processing EnterFullscreenModeForTab(). WebContents doesn't

weblayer/browser/tab_impl.h

@@ -125,6 +125,7 @@ class TabImpl : public Tab,
   // content::WebContentsObserver:
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
+  void RenderProcessGone(base::TerminationStatus status) override;
 
   // Called from closure supplied to delegate to exit fullscreen.
   void OnExitFullscreen();

weblayer/public/java/org/chromium/weblayer/Tab.java

@@ -224,6 +224,13 @@ public final class Tab {
             assert tab.getBrowser() == getBrowser();
             mNewTabCallback.onNewTab(tab, mode);
         }
+
+        @Override
+        public void onRenderProcessGone() {
+            for (TabCallback callback : mCallbacks) {
+                callback.onRenderProcessGone();
+            }
+        }
     }
 
     private static final class DownloadCallbackClientImpl extends IDownloadCallbackClient.Stub {

weblayer/public/java/org/chromium/weblayer/TabCallback.java

@@ -18,4 +18,10 @@ public abstract class TabCallback {
      * @param url The new user-visible url.
      */
     public void onVisibleUrlChanged(@NonNull Uri url) {}
+
+    /**
+     * Triggered when the render process dies, either due to crash or killed by the system to
+     * reclaim memory.
+     */
+    public void onRenderProcessGone() {}
 }

weblayer/public/tab_observer.h

@@ -14,6 +14,10 @@ class TabObserver {
   // The URL bar should be updated to |url|.
   virtual void DisplayedUrlChanged(const GURL& url) {}
 
+  // Triggered when the render process dies, either due to crash or killed by the system to
+  // reclaim memory.
+  virtual void OnRenderProcessGone() {}
+
  protected:
   virtual ~TabObserver() {}
 };

weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TabCallbackTest.java

@@ -12,15 +12,18 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.BaseJUnit4ClassRunner;
+import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.weblayer.Tab;
 import org.chromium.weblayer.TabCallback;
 import org.chromium.weblayer.shell.InstrumentationActivity;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeoutException;
 
 /**
  * Tests that TabCallback methods are invoked as expected.
@@ -71,14 +74,33 @@ public class TabCallbackTest {
         String startupUrl = "about:blank";
         InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl(startupUrl);
 
-        Callback calllback = new Callback();
+        Callback callback = new Callback();
         TestThreadUtils.runOnUiThreadBlocking(
-                () -> { activity.getTab().registerTabCallback(calllback); });
+                () -> { activity.getTab().registerTabCallback(callback); });
 
         String url = "data:text,foo";
         mActivityTestRule.navigateAndWait(url);
 
         /* Verify that the visible URL changes to the target. */
-        calllback.visibleUrlChangedCallback.waitUntilValueObserved(url);
+        callback.visibleUrlChangedCallback.waitUntilValueObserved(url);
+    }
+
+    @Test
+    @SmallTest
+    public void testOnRenderProcessGone() throws TimeoutException {
+        InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl("about:blank");
+        CallbackHelper callbackHelper = new CallbackHelper();
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            Tab tab = activity.getTab();
+            TabCallback callback = new TabCallback() {
+                @Override
+                public void onRenderProcessGone() {
+                    callbackHelper.notifyCalled();
+                }
+            };
+            tab.registerTabCallback(callback);
+            tab.getNavigationController().navigate(Uri.parse("chrome://crash"));
+        });
+        callbackHelper.waitForFirst();
     }
 }