Browser Plugin: More robust recovery from guest crash

content/browser/browser_plugin/test_browser_plugin_guest.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 "content/browser/browser_plugin/test_browser_plugin_guest.h"
 
 #include "base/test/test_timeouts.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin_messages.h"
 #include "content/public/browser/notification_types.h"
 
 namespace content {
 
 class BrowserPluginGuest;
 
 TestBrowserPluginGuest::TestBrowserPluginGuest(
     int instance_id,
     WebContentsImpl* web_contents,
     RenderViewHost* render_view_host)
     : BrowserPluginGuest(instance_id, web_contents, render_view_host),
       update_rect_count_(0),
       damage_buffer_call_count_(0),
       crash_observed_(false),
       focus_observed_(false),
       advance_focus_observed_(false),
       was_hidden_observed_(false),
       stop_observed_(false),
       reload_observed_(false),
+      set_damage_buffer_observed_(false),
+      input_observed_(false),
       waiting_for_damage_buffer_with_size_(false),
       last_damage_buffer_size_(gfx::Size()) {
   // Listen to visibility changes so that a test can wait for these changes.
   notification_registrar_.Add(this,
                               NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
                               Source<WebContents>(web_contents));
 }
 
 TestBrowserPluginGuest::~TestBrowserPluginGuest() {
 }
@@ skipping 53 matching lines @@
 }
 
 void TestBrowserPluginGuest::RenderViewGone(base::TerminationStatus status) {
   crash_observed_ = true;
   LOG(INFO) << "Guest crashed";
   if (crash_message_loop_runner_)
     crash_message_loop_runner_->Quit();
   BrowserPluginGuest::RenderViewGone(status);
 }
 
+void TestBrowserPluginGuest::HandleInputEvent(
+    RenderViewHost* render_view_host,
+    const gfx::Rect& guest_rect,
+    const WebKit::WebInputEvent& event,
+    IPC::Message* reply_message) {
+  BrowserPluginGuest::HandleInputEvent(render_view_host,
+                                       guest_rect,
+                                       event,
+                                       reply_message);
+  input_observed_ = true;
+  if (input_message_loop_runner_)
+    input_message_loop_runner_->Quit();
+}
+
 void TestBrowserPluginGuest::WaitForCrashed() {
   // Check if we already observed a guest crash, return immediately if so.
   if (crash_observed_)
     return;
 
   crash_message_loop_runner_ = new MessageLoopRunner();
   crash_message_loop_runner_->Run();
 }
 
 void TestBrowserPluginGuest::WaitForFocus() {
@@ skipping 35 matching lines @@
   if (stop_observed_) {
     stop_observed_ = false;
     return;
   }
 
   stop_message_loop_runner_ = new MessageLoopRunner();
   stop_message_loop_runner_->Run();
   stop_observed_ = false;
 }
 
+void TestBrowserPluginGuest::WaitForInput() {
+  if (input_observed_) {
+    input_observed_ = false;
+    return;
+  }
+
+  input_message_loop_runner_ = new MessageLoopRunner();
+  input_message_loop_runner_->Run();
+  input_observed_ = false;
+}
+
 void TestBrowserPluginGuest::SetFocus(bool focused) {
   focus_observed_ = true;
   if (focus_message_loop_runner_)
     focus_message_loop_runner_->Quit();
   BrowserPluginGuest::SetFocus(focused);
 }
 
 bool TestBrowserPluginGuest::ViewTakeFocus(bool reverse) {
   advance_focus_observed_ = true;
   if (advance_focus_message_loop_runner_)
@@ skipping 35 matching lines @@
   BrowserPluginGuest::SetDamageBuffer(
       damage_buffer,
 #if defined(OS_WIN)
       damage_buffer_size,
 #endif
       damage_view_size,
       scale_factor);
 }
 
 }  // namespace content