Browser Plugin: More robust recovery from guest crash

content/browser/browser_plugin/browser_plugin_host_browsertest.cc

 // Copyright (c) 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 "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
@@ skipping 623 matching lines @@
 
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
   rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
       "document.getElementById('plugin').terminate()"));
 
   // Expect the guest to crash.
   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, "");
 
   const string16 expected_title = ASCIIToUTF16(kHTMLForGuest);
   content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                       expected_title);
   // Renavigate the guest to |kHTMLForGuest|.
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
@@ skipping 49 matching lines @@
   EXPECT_TRUE(v->GetAsString(&result));
   EXPECT_EQ(redirect_url.spec().c_str(), result);
 
   v = rvh->ExecuteJavascriptAndGetValue(
       string16(), ASCIIToUTF16("redirectNewUrl"));
   EXPECT_TRUE(v->GetAsString(&result));
   EXPECT_EQ(test_server()->GetURL("files/title1.html").spec().c_str(), result);
 }
 
 }  // namespace content