Browser Plugin: More robust recovery from guest crash

content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
index 703a4f9e894ce006e34f8cb50df369202d02aa0e..fe59c8fe225c466bab15d4461dd8bfc71692b71b 100644
--- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
@@ -641,6 +641,49 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, TerminateGuest) {
   test_guest()->WaitForCrashed();
 }
 
+// This test verifies that the guest is responsive after crashing and going back
+// to a previous navigation entry.
+IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, BackAfterTerminateGuest) {
+  const char* kEmbedderURL = "files/browser_plugin_embedder.html";
+  StartBrowserPluginTest(
+      kEmbedderURL, GetHTMLForGuestWithTitle("P1"), true, "");
+  RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
+      test_embedder()->web_contents()->GetRenderViewHost());
+
+  // Navigate to P2 and verify that the navigation occurred.
+  {
+    const string16 expected_title = ASCIIToUTF16("P2");
+    content::TitleWatcher title_watcher(test_guest()->web_contents(),
+                                        expected_title);
+
+    rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+        StringPrintf("SetSrc('%s');", GetHTMLForGuestWithTitle("P2").c_str())));
+
+    string16 actual_title = title_watcher.WaitAndGetTitle();
+    EXPECT_EQ(expected_title, actual_title);
+  }
+  // Kill the guest.
+  rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+      "document.getElementById('plugin').terminate()"));
+
+  // Expect the guest to report that it crashed.
+  test_guest()->WaitForCrashed();
+  // Go back and verify that we're back at P1.
+  {
+    const string16 expected_title = ASCIIToUTF16("P1");
+    content::TitleWatcher title_watcher(test_guest()->web_contents(),
+                                        expected_title);
+
+    rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16("Back();"));
+
+    string16 actual_title = title_watcher.WaitAndGetTitle();
+    EXPECT_EQ(expected_title, actual_title);
+  }
+  // Send an input event and verify that the guest receives the input.
+  SimulateMouseClick(test_embedder()->web_contents());

[Charlie Reis, 2012/10/12 04:10:25]

What's the reason for adding all this input event test logic?  If it's just to
check if the guest thinks it is still crashed, would it be easier to just check
something like test_guest()->IsCrashed() here?

[Fady Samuel, 2012/10/12 17:33:06]

One of the symptoms manifested by this bug was that input was being dropped on
the floor in BrowserPlugin because it thought it's still crashed [and we
continued to show a sad plugin]. I don't just want to verify that the guest is
no longer crashed, I also want to verify that 1. BrowserPlugin knows that the
guest is longer crashed. 2. BrowserPlugin correctly forwards input to the guest
after it has recovered from crash.

+  test_guest()->WaitForInput();
+}
+
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadStart) {
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, "about:blank", true, "");